openstack/trove
Code Issues Proposed changes

Merge "Retire TripleO: remove the TripleO jobs/ref"

Browse Source
This commit is contained in:
Zuul 2024-03-25 04:28:10 +00:00 committed by Gerrit Code Review
commit 83a525067d
6 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/settings
View File

@ -16,10 +16,6 @@ TROVE_DASHBOARD_DIR=${TROVE_DASHBOARD_DIR:-${DEST}/trove-dashboard}
TROVE_DASHBOARD_REPO=${TROVE_DASHBOARD_REPO:-${GIT_BASE}/openstack/trove-dashboard.git} TROVE_DASHBOARD_REPO=${TROVE_DASHBOARD_REPO:-${GIT_BASE}/openstack/trove-dashboard.git}
TROVE_DASHBOARD_BRANCH=${TROVE_DASHBOARD_BRANCH:-master} TROVE_DASHBOARD_BRANCH=${TROVE_DASHBOARD_BRANCH:-master}
TRIPLEO_IMAGES_DIR=${TRIPLEO_IMAGES_DIR:-${DEST}/tripleo-image-elements}
TRIPLEO_IMAGES_REPO=${TRIPLEO_IMAGES_REPO:-${GIT_BASE}/openstack/tripleo-image-elements.git}
TRIPLEO_IMAGES_BRANCH=${TRIPLEO_IMAGES_BRANCH:-master}
# Set up configuration directory and files # Set up configuration directory and files
TROVE_CONF_DIR=${TROVE_CONF_DIR:-/etc/trove} TROVE_CONF_DIR=${TROVE_CONF_DIR:-/etc/trove}
TROVE_CONF=${TROVE_CONF:-${TROVE_CONF_DIR}/trove.conf} TROVE_CONF=${TROVE_CONF:-${TROVE_CONF_DIR}/trove.conf}
@ -103,4 +99,4 @@ else
TROVE_DATABASE_IMAGE_POSTGRES=${TROVE_DATABASE_IMAGE_POSTGRES:-"docker.io/library/postgres"} TROVE_DATABASE_IMAGE_POSTGRES=${TROVE_DATABASE_IMAGE_POSTGRES:-"docker.io/library/postgres"}
TROVE_DATABASE_BACKUP_IMAGE_MYSQL=${TROVE_DATABASE_BACKUP_IMAGE_MYSQL:-""} TROVE_DATABASE_BACKUP_IMAGE_MYSQL=${TROVE_DATABASE_BACKUP_IMAGE_MYSQL:-""}
TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-""} TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-""}
fi fi

2
integration/scripts/functions
View File

@ -305,7 +305,7 @@ function git_checkout() {
if [ -n "$REPO_BRANCH" ]; then if [ -n "$REPO_BRANCH" ]; then
pushd "$REPO_DIR" pushd "$REPO_DIR"
if [ $PROJECT == "diskimage-builder" ] || [ $PROJECT == "tripleo-image-elements" ]; then if [ $PROJECT == "diskimage-builder" ]; then
REPO_BRANCH=master REPO_BRANCH=master
fi fi
CURRENT_BRANCH=$(git branch | grep "\*" | awk '{print $2}') CURRENT_BRANCH=$(git branch | grep "\*" | awk '{print $2}')

1
integration/scripts/image-projects-list
View File

@ -1,2 +1 @@
diskimage-builder diskimage-builder
tripleo-image-elements

1
integration/scripts/trovestack
View File

@ -262,7 +262,6 @@ function install_prep_packages() {
#pkg_install git-core kvm-ipxe gettext #pkg_install git-core kvm-ipxe gettext
pkg_install git-core gettext pkg_install git-core gettext
fi fi
sudo -H $HTTP_PROXY pip install --upgrade pip dib-utils
} }
function install_devstack_code() { function install_devstack_code() {

3
zuul.d/deprecated_jobs.yaml
View File

@ -6,7 +6,6 @@
required-projects: required-projects:
- openstack/tempest - openstack/tempest
- openstack/diskimage-builder - openstack/diskimage-builder
- openstack/tripleo-image-elements
- openstack/trove - openstack/trove
- openstack/trove-dashboard - openstack/trove-dashboard
vars: vars:
@ -329,4 +328,4 @@
tempest_test_timeout: 3600 tempest_test_timeout: 3600
tempest_test_exclude_list: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/trove-tempest-plugin"].src_dir }}/tempest_exclude_list.txt' tempest_test_exclude_list: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/trove-tempest-plugin"].src_dir }}/tempest_exclude_list.txt'
zuul_copy_output: zuul_copy_output:
'/var/log/guest-agent-logs/': 'logs' '/var/log/guest-agent-logs/': 'logs'

3
zuul.d/jobs.yaml
View File

@ -430,7 +430,6 @@
required-projects: required-projects:
- openstack/diskimage-builder - openstack/diskimage-builder
- openstack/trove - openstack/trove
- openstack/tripleo-image-elements
- job: - job:
name: trove-ubuntu-guest-image-build name: trove-ubuntu-guest-image-build
@ -442,7 +441,6 @@
required-projects: required-projects:
- openstack/diskimage-builder - openstack/diskimage-builder
- openstack/trove - openstack/trove
- openstack/tripleo-image-elements
files: files:
- ^integration/(scripts|tests)/ - ^integration/(scripts|tests)/
vars: vars:
@ -463,7 +461,6 @@
required-projects: required-projects:
- openstack/diskimage-builder - openstack/diskimage-builder
- openstack/trove - openstack/trove
- openstack/tripleo-image-elements
files: files:
- ^integration/(scripts|tests)/ - ^integration/(scripts|tests)/
vars: vars: