From 3348c6ef8d14031f03a5a17da5ee7db8fd7e6d41 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 19 Jan 2023 12:07:08 +0100
Subject: [PATCH] CI: Rename jobs - drop source part
Change-Id: Ib69642056e760bad0e4ea13576502f0e08115259
---
zuul.d/jobs.yaml | 96 +++++++++++++++++++++---------------------
zuul.d/project.yaml | 100 ++++++++++++++++++++++----------------------
2 files changed, 98 insertions(+), 98 deletions(-)
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 322a096ea8..ba5adfa13f 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,6 +1,6 @@
---
- job:
- name: kolla-ansible-centos9s-source
+ name: kolla-ansible-centos9s
parent: kolla-ansible-base
nodeset: kolla-ansible-centos9s
voting: false
@@ -10,8 +10,8 @@
kolla_build_images: true
- job:
- name: kolla-ansible-debian-source-aarch64
- parent: kolla-ansible-debian-source
+ name: kolla-ansible-debian-aarch64
+ parent: kolla-ansible-debian
nodeset: kolla-ansible-debian-bullseye-aarch64
voting: false
timeout: 10800
@@ -19,7 +19,7 @@
- openstack/kolla
- job:
- name: kolla-ansible-debian-source
+ name: kolla-ansible-debian
parent: kolla-ansible-base
nodeset: kolla-ansible-debian-bullseye
vars:
@@ -27,7 +27,7 @@
tls_enabled: true
- job:
- name: kolla-ansible-openeuler-source
+ name: kolla-ansible-openeuler
parent: kolla-ansible-base
nodeset: kolla-ansible-openeuler-22.03-lts
voting: false
@@ -36,7 +36,7 @@
tls_enabled: true
- job:
- name: kolla-ansible-rocky9-source
+ name: kolla-ansible-rocky9
parent: kolla-ansible-base
nodeset: kolla-ansible-rocky9
vars:
@@ -44,7 +44,7 @@
tls_enabled: true
- job:
- name: kolla-ansible-ubuntu-source
+ name: kolla-ansible-ubuntu
parent: kolla-ansible-base
nodeset: kolla-ansible-jammy
vars:
@@ -52,35 +52,35 @@
tls_enabled: true
- job:
- name: kolla-ansible-rocky9-source-kvm
+ name: kolla-ansible-rocky9-kvm
parent: kolla-ansible-kvm-base
nodeset: kolla-ansible-rocky9-nested-virt
vars:
base_distro: rocky
- job:
- name: kolla-ansible-ubuntu-source-kvm
+ name: kolla-ansible-ubuntu-kvm
parent: kolla-ansible-kvm-base
nodeset: kolla-ansible-jammy-nested-virt
vars:
base_distro: ubuntu
- job:
- name: kolla-ansible-rocky9-source-multinode-ipv6
+ name: kolla-ansible-rocky9-multinode-ipv6
parent: kolla-ansible-ipv6-base
nodeset: kolla-ansible-rocky9-multi
vars:
base_distro: rocky
- job:
- name: kolla-ansible-ubuntu-source-multinode-ipv6
+ name: kolla-ansible-ubuntu-multinode-ipv6
parent: kolla-ansible-ipv6-base
nodeset: kolla-ansible-jammy-multi
vars:
base_distro: ubuntu
- job:
- name: kolla-ansible-rocky9-source-cephadm
+ name: kolla-ansible-rocky9-cephadm
parent: kolla-ansible-cephadm-base
nodeset: kolla-ansible-rocky9-multi
timeout: 9000
@@ -89,7 +89,7 @@
cephadm_use_package_from_distribution: true
- job:
- name: kolla-ansible-ubuntu-source-cephadm
+ name: kolla-ansible-ubuntu-cephadm
parent: kolla-ansible-cephadm-base
nodeset: kolla-ansible-jammy-multi
timeout: 9000
@@ -98,21 +98,21 @@
cephadm_use_package_from_distribution: true
- job:
- name: kolla-ansible-rocky9-source-mariadb
+ name: kolla-ansible-rocky9-mariadb
parent: kolla-ansible-mariadb-base
nodeset: kolla-ansible-rocky9-multi
vars:
base_distro: rocky
- job:
- name: kolla-ansible-ubuntu-source-mariadb
+ name: kolla-ansible-ubuntu-mariadb
parent: kolla-ansible-mariadb-base
nodeset: kolla-ansible-jammy-multi
vars:
base_distro: ubuntu
- job:
- name: kolla-ansible-debian-source-upgrade
+ name: kolla-ansible-debian-upgrade
parent: kolla-ansible-base
nodeset: kolla-ansible-debian-bullseye
timeout: 9000
@@ -122,8 +122,8 @@
tls_enabled: true
- job:
- name: kolla-ansible-debian-source-upgrade-aarch64
- parent: kolla-ansible-debian-source-upgrade
+ name: kolla-ansible-debian-upgrade-aarch64
+ parent: kolla-ansible-debian-upgrade
nodeset: kolla-ansible-debian-bullseye-aarch64
- job:
@@ -137,7 +137,7 @@
tls_enabled: true
- job:
- name: kolla-ansible-ubuntu-source-upgrade
+ name: kolla-ansible-ubuntu-upgrade
parent: kolla-ansible-base
nodeset: kolla-ansible-focal
timeout: 9000
@@ -147,7 +147,7 @@
tls_enabled: true
- job:
- name: kolla-ansible-ubuntu-source-upgrade-cephadm
+ name: kolla-ansible-ubuntu-upgrade-cephadm
parent: kolla-ansible-cephadm-base
nodeset: kolla-ansible-focal-multi
timeout: 9000
@@ -156,7 +156,7 @@
is_upgrade: yes
- job:
- name: kolla-ansible-ubuntu-source-upgrade-ovn
+ name: kolla-ansible-ubuntu-upgrade-ovn
parent: kolla-ansible-ovn-base
nodeset: kolla-ansible-focal-multi
timeout: 9000
@@ -165,42 +165,42 @@
is_upgrade: yes
- job:
- name: kolla-ansible-rocky9-source-bifrost
+ name: kolla-ansible-rocky9-bifrost
parent: kolla-ansible-bifrost-base
nodeset: kolla-ansible-rocky9
vars:
base_distro: rocky
- job:
- name: kolla-ansible-ubuntu-source-bifrost
+ name: kolla-ansible-ubuntu-bifrost
parent: kolla-ansible-bifrost-base
nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
- job:
- name: kolla-ansible-rocky9-source-zun
+ name: kolla-ansible-rocky9-zun
parent: kolla-ansible-zun-base
nodeset: kolla-ansible-rocky9-multi
vars:
base_distro: rocky
- job:
- name: kolla-ansible-debian-source-zun
+ name: kolla-ansible-debian-zun
parent: kolla-ansible-zun-base
nodeset: kolla-ansible-debian-bullseye-multi
vars:
base_distro: debian
- job:
- name: kolla-ansible-ubuntu-source-zun
+ name: kolla-ansible-ubuntu-zun
parent: kolla-ansible-zun-base
nodeset: kolla-ansible-jammy-multi
vars:
base_distro: ubuntu
- job:
- name: kolla-ansible-rocky9-source-swift
+ name: kolla-ansible-rocky9-swift
parent: kolla-ansible-swift-base
nodeset: kolla-ansible-rocky9-multi
vars:
@@ -210,7 +210,7 @@
base_distro_version: 9
- job:
- name: kolla-ansible-ubuntu-source-swift
+ name: kolla-ansible-ubuntu-swift
parent: kolla-ansible-swift-base
nodeset: kolla-ansible-jammy-multi
vars:
@@ -220,7 +220,7 @@
base_distro_version: jammy
- job:
- name: kolla-ansible-ubuntu-source-swift-upgrade
+ name: kolla-ansible-ubuntu-swift-upgrade
parent: kolla-ansible-swift-base
nodeset: kolla-ansible-focal-multi
timeout: 10800
@@ -229,119 +229,119 @@
is_upgrade: yes
- job:
- name: kolla-ansible-rocky9-source-scenario-nfv
+ name: kolla-ansible-rocky9-scenario-nfv
parent: kolla-ansible-scenario-nfv-base
nodeset: kolla-ansible-rocky9-multi
vars:
base_distro: rocky
- job:
- name: kolla-ansible-rocky9-source-ironic
+ name: kolla-ansible-rocky9-ironic
parent: kolla-ansible-ironic-base
nodeset: kolla-ansible-rocky9
vars:
base_distro: rocky
- job:
- name: kolla-ansible-debian-source-ironic
+ name: kolla-ansible-debian-ironic
parent: kolla-ansible-ironic-base
nodeset: kolla-ansible-debian-bullseye
vars:
base_distro: debian
- job:
- name: kolla-ansible-ubuntu-source-ironic
+ name: kolla-ansible-ubuntu-ironic
parent: kolla-ansible-ironic-base
nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
- job:
- name: kolla-ansible-rocky9-source-magnum
+ name: kolla-ansible-rocky9-magnum
parent: kolla-ansible-magnum-base
nodeset: kolla-ansible-rocky9
vars:
base_distro: rocky
- job:
- name: kolla-ansible-ubuntu-source-magnum
+ name: kolla-ansible-ubuntu-magnum
parent: kolla-ansible-magnum-base
nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
- job:
- name: kolla-ansible-rocky9-source-octavia
+ name: kolla-ansible-rocky9-octavia
parent: kolla-ansible-octavia-base
nodeset: kolla-ansible-rocky9
vars:
base_distro: rocky
- job:
- name: kolla-ansible-ubuntu-source-octavia
+ name: kolla-ansible-ubuntu-octavia
parent: kolla-ansible-octavia-base
nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
- job:
- name: kolla-ansible-ubuntu-source-masakari
+ name: kolla-ansible-ubuntu-masakari
parent: kolla-ansible-masakari-base
nodeset: kolla-ansible-jammy-masakari
vars:
base_distro: ubuntu
- job:
- name: kolla-ansible-rocky9-source-masakari
+ name: kolla-ansible-rocky9-masakari
parent: kolla-ansible-masakari-base
nodeset: kolla-ansible-rocky9-masakari
vars:
base_distro: rocky
- job:
- name: kolla-ansible-ubuntu-source-cells
+ name: kolla-ansible-ubuntu-cells
parent: kolla-ansible-cells-base
nodeset: kolla-ansible-jammy-multi
vars:
base_distro: ubuntu
- job:
- name: kolla-ansible-rocky9-source-cells
+ name: kolla-ansible-rocky9-cells
parent: kolla-ansible-cells-base
nodeset: kolla-ansible-rocky9-multi
vars:
base_distro: rocky
- job:
- name: kolla-ansible-rocky9-source-ovn
+ name: kolla-ansible-rocky9-ovn
parent: kolla-ansible-ovn-base
nodeset: kolla-ansible-rocky9-multi
vars:
base_distro: rocky
- job:
- name: kolla-ansible-ubuntu-source-ovn
+ name: kolla-ansible-ubuntu-ovn
parent: kolla-ansible-ovn-base
nodeset: kolla-ansible-jammy-multi
vars:
base_distro: ubuntu
- job:
- name: kolla-ansible-rocky9-source-prometheus-opensearch
+ name: kolla-ansible-rocky9-prometheus-opensearch
parent: kolla-ansible-prometheus-opensearch-base
nodeset: kolla-ansible-rocky9
vars:
base_distro: rocky
- job:
- name: kolla-ansible-ubuntu-source-prometheus-opensearch
+ name: kolla-ansible-ubuntu-prometheus-opensearch
parent: kolla-ansible-prometheus-opensearch-base
nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
- job:
- name: kolla-ansible-ubuntu-source-prometheus-opensearch-upgrade
+ name: kolla-ansible-ubuntu-prometheus-opensearch-upgrade
parent: kolla-ansible-prometheus-opensearch-base
nodeset: kolla-ansible-focal
vars:
@@ -349,14 +349,14 @@
is_upgrade: yes
- job:
- name: kolla-ansible-rocky9-source-venus
+ name: kolla-ansible-rocky9-venus
parent: kolla-ansible-venus-base
nodeset: kolla-ansible-rocky9
vars:
base_distro: rocky
- job:
- name: kolla-ansible-ubuntu-source-venus
+ name: kolla-ansible-ubuntu-venus
parent: kolla-ansible-venus-base
nodeset: kolla-ansible-jammy
vars:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index e27079844e..cf5476d078 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -11,61 +11,61 @@
- periodic-stable-jobs
check:
jobs:
- - kolla-ansible-centos9s-source
- - kolla-ansible-debian-source
- - kolla-ansible-openeuler-source
- - kolla-ansible-rocky9-source
- - kolla-ansible-ubuntu-source
- - kolla-ansible-rocky9-source-kvm
- - kolla-ansible-ubuntu-source-kvm
- - kolla-ansible-rocky9-source-multinode-ipv6
- - kolla-ansible-ubuntu-source-multinode-ipv6
- - kolla-ansible-rocky9-source-bifrost
- - kolla-ansible-ubuntu-source-bifrost
- - kolla-ansible-rocky9-source-zun
- - kolla-ansible-debian-source-zun
- - kolla-ansible-ubuntu-source-zun
- - kolla-ansible-rocky9-source-swift
- - kolla-ansible-ubuntu-source-swift
- - kolla-ansible-rocky9-source-scenario-nfv
- - kolla-ansible-rocky9-source-magnum
- - kolla-ansible-ubuntu-source-magnum
- - kolla-ansible-rocky9-source-octavia
- - kolla-ansible-ubuntu-source-octavia
- - kolla-ansible-rocky9-source-masakari
- - kolla-ansible-ubuntu-source-masakari
- - kolla-ansible-rocky9-source-ironic
- - kolla-ansible-debian-source-ironic
- - kolla-ansible-ubuntu-source-ironic
- - kolla-ansible-debian-source-upgrade
- - kolla-ansible-ubuntu-source-upgrade
+ - kolla-ansible-centos9s
+ - kolla-ansible-debian
+ - kolla-ansible-openeuler
+ - kolla-ansible-rocky9
+ - kolla-ansible-ubuntu
+ - kolla-ansible-rocky9-kvm
+ - kolla-ansible-ubuntu-kvm
+ - kolla-ansible-rocky9-multinode-ipv6
+ - kolla-ansible-ubuntu-multinode-ipv6
+ - kolla-ansible-rocky9-bifrost
+ - kolla-ansible-ubuntu-bifrost
+ - kolla-ansible-rocky9-zun
+ - kolla-ansible-debian-zun
+ - kolla-ansible-ubuntu-zun
+ - kolla-ansible-rocky9-swift
+ - kolla-ansible-ubuntu-swift
+ - kolla-ansible-rocky9-scenario-nfv
+ - kolla-ansible-rocky9-magnum
+ - kolla-ansible-ubuntu-magnum
+ - kolla-ansible-rocky9-octavia
+ - kolla-ansible-ubuntu-octavia
+ - kolla-ansible-rocky9-masakari
+ - kolla-ansible-ubuntu-masakari
+ - kolla-ansible-rocky9-ironic
+ - kolla-ansible-debian-ironic
+ - kolla-ansible-ubuntu-ironic
+ - kolla-ansible-debian-upgrade
+ - kolla-ansible-ubuntu-upgrade
- kolla-ansible-ubuntu-binary-upgrade
- - kolla-ansible-ubuntu-source-cells
- - kolla-ansible-rocky9-source-cells
- - kolla-ansible-rocky9-source-mariadb
- - kolla-ansible-ubuntu-source-mariadb
- - kolla-ansible-rocky9-source-ovn
- - kolla-ansible-ubuntu-source-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-ubuntu-source-venus
- - kolla-ansible-rocky9-source-cephadm
- - kolla-ansible-ubuntu-source-cephadm
- - kolla-ansible-ubuntu-source-upgrade-cephadm
+ - kolla-ansible-ubuntu-cells
+ - kolla-ansible-rocky9-cells
+ - kolla-ansible-rocky9-mariadb
+ - kolla-ansible-ubuntu-mariadb
+ - kolla-ansible-rocky9-ovn
+ - kolla-ansible-ubuntu-ovn
+ - kolla-ansible-ubuntu-upgrade-ovn
+ - kolla-ansible-rocky9-prometheus-opensearch
+ - kolla-ansible-ubuntu-prometheus-opensearch
+ - kolla-ansible-ubuntu-prometheus-opensearch-upgrade
+ - kolla-ansible-ubuntu-venus
+ - kolla-ansible-rocky9-cephadm
+ - kolla-ansible-ubuntu-cephadm
+ - kolla-ansible-ubuntu-upgrade-cephadm
- kolla-ansible-rocky9-hashi-vault
check-arm64:
jobs:
- - kolla-ansible-debian-source-aarch64
- - kolla-ansible-debian-source-upgrade-aarch64
+ - kolla-ansible-debian-aarch64
+ - kolla-ansible-debian-upgrade-aarch64
gate:
jobs:
- - kolla-ansible-debian-source
- - kolla-ansible-debian-source-upgrade
- - kolla-ansible-rocky9-source
- - kolla-ansible-ubuntu-source
- - kolla-ansible-ubuntu-source-upgrade
+ - kolla-ansible-debian
+ - kolla-ansible-debian-upgrade
+ - kolla-ansible-rocky9
+ - kolla-ansible-ubuntu
+ - kolla-ansible-ubuntu-upgrade
experimental:
jobs:
- - kolla-ansible-ubuntu-source-swift-upgrade
+ - kolla-ansible-ubuntu-swift-upgrade
--
GitLab