diff --git a/.gitignore b/.gitignore index 38857d78be..616000842c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ trove.egg* .eggs/ trove/vcsversion.py *py*.egg -.coverage.* +.coverage coverage.xml cover/ dist/ diff --git a/devstack/settings b/devstack/settings index 623fa6536a..d265bd1687 100644 --- a/devstack/settings +++ b/devstack/settings @@ -14,10 +14,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/zed} -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/zed} - # Set up configuration directory and files TROVE_CONF_DIR=${TROVE_CONF_DIR:-/etc/trove} TROVE_CONF=${TROVE_CONF:-${TROVE_CONF_DIR}/trove.conf} 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 92a921f581..073b3e2d4b 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 ab86cf7df5..bac476fa86 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: @@ -408,7 +407,6 @@ required-projects: - openstack/diskimage-builder - openstack/trove - - openstack/tripleo-image-elements - job: name: trove-ubuntu-guest-image-build @@ -419,7 +417,6 @@ required-projects: - openstack/diskimage-builder - openstack/trove - - openstack/tripleo-image-elements files: - ^integration/(scripts|tests)/ vars: @@ -439,7 +436,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 cc95cfd1e4..1df3fdbfdd 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -41,7 +41,10 @@ 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