diff --git a/.coverage b/.coverage new file mode 100644 index 0000000000..ab9c144b61 Binary files /dev/null and b/.coverage differ diff --git a/devstack/settings b/devstack/settings index add060598f..38cc676f19 100644 --- a/devstack/settings +++ b/devstack/settings @@ -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_BRANCH=${TROVE_DASHBOARD_BRANCH:-stable/2023.1} -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:-stable/2023.1} - # Set up configuration directory and files TROVE_CONF_DIR=${TROVE_CONF_DIR:-/etc/trove} TROVE_CONF=${TROVE_CONF:-${TROVE_CONF_DIR}/trove.conf} @@ -101,4 +97,4 @@ else TROVE_DATABASE_IMAGE_POSTGRES=${TROVE_DATABASE_IMAGE_POSTGRES:-"catalystcloud/postgres"} TROVE_DATABASE_BACKUP_IMAGE_MYSQL=${TROVE_DATABASE_BACKUP_IMAGE_MYSQL:-"catalystcloud/db-backup-mysql:1.1.0"} TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-"catalystcloud/db-backup-postgresql:1.1.2"} -fi \ No newline at end of file +fi diff --git a/integration/scripts/functions b/integration/scripts/functions index fbbbd23f03..2f50bdc5d1 100644 --- a/integration/scripts/functions +++ b/integration/scripts/functions @@ -305,7 +305,7 @@ function git_checkout() { if [ -n "$REPO_BRANCH" ]; then pushd "$REPO_DIR" - if [ $PROJECT == "diskimage-builder" ] || [ $PROJECT == "tripleo-image-elements" ]; then + if [ $PROJECT == "diskimage-builder" ]; then REPO_BRANCH=master fi CURRENT_BRANCH=$(git branch | grep "\*" | awk '{print $2}') diff --git a/integration/scripts/image-projects-list b/integration/scripts/image-projects-list index 21e0aa5bc2..05b77d4fc7 100644 --- a/integration/scripts/image-projects-list +++ b/integration/scripts/image-projects-list @@ -1,2 +1 @@ diskimage-builder -tripleo-image-elements diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index 5502581c45..d559ffc4f0 100755 --- a/integration/scripts/trovestack +++ b/integration/scripts/trovestack @@ -262,7 +262,6 @@ function install_prep_packages() { #pkg_install git-core kvm-ipxe gettext pkg_install git-core gettext fi - sudo -H $HTTP_PROXY pip install --upgrade pip dib-utils } function install_devstack_code() { diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 80b95460b6..b154230314 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -6,7 +6,6 @@ required-projects: - openstack/tempest - openstack/diskimage-builder - - openstack/tripleo-image-elements - openstack/trove - openstack/trove-dashboard vars: @@ -425,7 +424,6 @@ required-projects: - openstack/diskimage-builder - openstack/trove - - openstack/tripleo-image-elements - job: name: trove-ubuntu-guest-image-build @@ -436,7 +434,6 @@ required-projects: - openstack/diskimage-builder - openstack/trove - - openstack/tripleo-image-elements files: - ^integration/(scripts|tests)/ vars: @@ -456,7 +453,6 @@ required-projects: - openstack/diskimage-builder - openstack/trove - - openstack/tripleo-image-elements files: - ^integration/(scripts|tests)/ vars: diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 7c981aa16e..141913b618 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -39,8 +39,14 @@ periodic: jobs: - publish-trove-guest-image-ubuntu-focal: - branches: ^(?!stable/.*).*$ + branches: + regex: ^stable/.*$ + negate: true - publish-trove-guest-image-ubuntu-focal-dev: - branches: ^(?!stable/.*).*$ + branches: + regex: ^stable/.*$ + negate: true - publish-trove-datastore-images: - branches: ^(?!stable/.*).*$ + branches: + regex: ^stable/.*$ + negate: true