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

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:-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
 TROVE_CONF_DIR=${TROVE_CONF_DIR:-/etc/trove}
 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_BACKUP_IMAGE_MYSQL=${TROVE_DATABASE_BACKUP_IMAGE_MYSQL:-""}
     TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-""}
-fi
+fi

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/deprecated_jobs.yaml

@@ -6,7 +6,6 @@
     required-projects:
       - openstack/tempest
       - openstack/diskimage-builder
-      - openstack/tripleo-image-elements
       - openstack/trove
       - openstack/trove-dashboard
     vars:
@@ -329,4 +328,4 @@
       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'
       zuul_copy_output:
-        '/var/log/guest-agent-logs/': 'logs'
+        '/var/log/guest-agent-logs/': 'logs'

zuul.d/jobs.yaml

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