Merge "Retire TripleO: remove the TripleO jobs/ref" into stable/zed

.gitignore

@@ -8,7 +8,7 @@ trove.egg*
 .eggs/
 trove/vcsversion.py
 *py*.egg
-.coverage.*
+.coverage
 coverage.xml
 cover/
 dist/

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}

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}')

integration/scripts/image-projects-list

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

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() {

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:

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