From a2447137d941d9c234f66cf7f89bfb6f47d0f238 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Thu, 29 Feb 2024 13:48:52 -0800
Subject: [PATCH] Retire TripleO: remove the TripleO jobs/ref

TripleO is retired so removing its jobs/ref

- https://review.opendev.org/q/topic:%22retire-tripleo%22

Change-Id: Id6fc86b570627bc6863dde330877966da3126fe6
---
 devstack/settings                       | 6 +-----
 integration/scripts/functions           | 2 +-
 integration/scripts/image-projects-list | 1 -
 integration/scripts/trovestack          | 1 -
 zuul.d/deprecated_jobs.yaml             | 3 +--
 zuul.d/jobs.yaml                        | 3 ---
 6 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/devstack/settings b/devstack/settings
index 7db2c5427a..0df5a0bce2 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:-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
\ 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 810379de75..d023ac002b 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/deprecated_jobs.yaml b/zuul.d/deprecated_jobs.yaml
index 5d74feff52..e962d4d5c1 100644
--- a/zuul.d/deprecated_jobs.yaml
+++ b/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'
\ No newline at end of file
+        '/var/log/guest-agent-logs/': 'logs'
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 040be61aad..461fd81811 100644
--- a/zuul.d/jobs.yaml
+++ b/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: