From 717dcdbc6fc8121511a048c050d225c7a9a083d6 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 1 Dec 2022 15:52:17 +0100
Subject: [PATCH] CI: Cleanup rocky9 upgrade jobs
Remove commented out rocky9 upgrade jobs, we'll add them after
the backport to stable/yoga.
Change-Id: Iade49b7834df909e19bbce49b85e258ee650436d
---
zuul.d/jobs.yaml | 41 -----------------------------------------
zuul.d/project.yaml | 6 ------
2 files changed, 47 deletions(-)
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 7923aa134..78ba8d3b5 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -111,17 +111,6 @@
vars:
base_distro: ubuntu
-- job:
- name: kolla-ansible-rocky9-source-upgrade
- parent: kolla-ansible-base
- nodeset: kolla-ansible-rocky9
- timeout: 9000
- vars:
- base_distro: rocky
- install_type: source
- is_upgrade: yes
- tls_enabled: true
-
- job:
name: kolla-ansible-debian-source-upgrade
parent: kolla-ansible-base
@@ -160,16 +149,6 @@
is_upgrade: yes
tls_enabled: true
-- job:
- name: kolla-ansible-rocky9-source-upgrade-cephadm
- parent: kolla-ansible-cephadm-base
- nodeset: kolla-ansible-rocky9-multi
- timeout: 9000
- vars:
- base_distro: rocky
- install_type: source
- is_upgrade: yes
-
- job:
name: kolla-ansible-ubuntu-source-upgrade-cephadm
parent: kolla-ansible-cephadm-base
@@ -180,16 +159,6 @@
install_type: source
is_upgrade: yes
-- job:
- name: kolla-ansible-rocky9-source-upgrade-ovn
- parent: kolla-ansible-ovn-base
- nodeset: kolla-ansible-rocky9-multi
- timeout: 9000
- vars:
- base_distro: rocky
- install_type: source
- is_upgrade: yes
-
- job:
name: kolla-ansible-ubuntu-source-upgrade-ovn
parent: kolla-ansible-ovn-base
@@ -255,16 +224,6 @@
# of Kolla Ansible and need to know the version of images.
base_distro_version: jammy
-- job:
- name: kolla-ansible-rocky9-source-swift-upgrade
- parent: kolla-ansible-swift-base
- nodeset: kolla-ansible-rocky9-multi
- timeout: 10800
- vars:
- base_distro: rocky
- install_type: source
- is_upgrade: yes
-
- job:
name: kolla-ansible-ubuntu-source-swift-upgrade
parent: kolla-ansible-swift-base
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 7c1582986..571c92541 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -37,7 +37,6 @@
- kolla-ansible-rocky9-source-ironic
- kolla-ansible-debian-source-ironic
- kolla-ansible-ubuntu-source-ironic
- # - kolla-ansible-rocky9-source-upgrade
- kolla-ansible-debian-source-upgrade
- kolla-ansible-ubuntu-source-upgrade
- kolla-ansible-ubuntu-binary-upgrade
@@ -47,16 +46,13 @@
- kolla-ansible-ubuntu-source-mariadb
- kolla-ansible-rocky9-source-ovn
- kolla-ansible-ubuntu-source-ovn
- # - kolla-ansible-rocky9-source-upgrade-ovn
- kolla-ansible-ubuntu-source-upgrade-ovn
- kolla-ansible-rocky9-source-prometheus-opensearch
- kolla-ansible-ubuntu-source-prometheus-opensearch
- kolla-ansible-ubuntu-source-prometheus-opensearch-upgrade
- # - kolla-ansible-rocky9-source-venus
- kolla-ansible-ubuntu-source-venus
- kolla-ansible-rocky9-source-cephadm
- kolla-ansible-ubuntu-source-cephadm
- # - kolla-ansible-rocky9-source-upgrade-cephadm
- kolla-ansible-ubuntu-source-upgrade-cephadm
- kolla-ansible-rocky9-hashi-vault
check-arm64:
@@ -65,7 +61,6 @@
- kolla-ansible-debian-source-upgrade-aarch64
gate:
jobs:
- # - kolla-ansible-rocky9-source-upgrade
- kolla-ansible-debian-source
- kolla-ansible-debian-source-upgrade
- kolla-ansible-rocky9-source
@@ -73,5 +68,4 @@
- kolla-ansible-ubuntu-source-upgrade
experimental:
jobs:
- - kolla-ansible-rocky9-source-swift-upgrade
- kolla-ansible-ubuntu-source-swift-upgrade
--
GitLab