From d561d8f372e217672499d20eb27f32e81ab4f421 Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Fri, 11 Feb 2022 14:18:34 -0300
Subject: [PATCH] upstream ci: Rename CentOS 9 pipelines jobs to c9s.
The correct name for upcoming release of CentOS is CentOS 9 Stream,
usually abbreviated to 'c9s'. As we need to differentiate from the
stream and the standard versions, this patch modifies the Azure
piipelines to use 'c9s' instead of 'CentOS 9'.
---
.../{centos-9-build => c9s-build}/Dockerfile | 0
.../{centos-9-build => c9s-build}/molecule.yml | 2 +-
molecule/{centos-9 => c9s}/molecule.yml | 4 ++--
tests/azure/azure-pipelines.yml | 2 +-
tests/azure/build-containers.yml | 6 +++---
tests/azure/nightly.yml | 16 ++++++++--------
6 files changed, 15 insertions(+), 15 deletions(-)
rename molecule/{centos-9-build => c9s-build}/Dockerfile (100%)
rename molecule/{centos-9-build => c9s-build}/molecule.yml (93%)
rename molecule/{centos-9 => c9s}/molecule.yml (81%)
diff --git a/molecule/centos-9-build/Dockerfile b/molecule/c9s-build/Dockerfile
similarity index 100%
rename from molecule/centos-9-build/Dockerfile
rename to molecule/c9s-build/Dockerfile
diff --git a/molecule/centos-9-build/molecule.yml b/molecule/c9s-build/molecule.yml
similarity index 93%
rename from molecule/centos-9-build/molecule.yml
rename to molecule/c9s-build/molecule.yml
index c333ec41..dfa65480 100644
--- a/molecule/centos-9-build/molecule.yml
+++ b/molecule/c9s-build/molecule.yml
@@ -2,7 +2,7 @@
driver:
name: docker
platforms:
- - name: centos-9-build
+ - name: c9s-build
image: "quay.io/centos/centos:stream9"
dockerfile: Dockerfile
hostname: ipaserver.test.local
diff --git a/molecule/centos-9/molecule.yml b/molecule/c9s/molecule.yml
similarity index 81%
rename from molecule/centos-9/molecule.yml
rename to molecule/c9s/molecule.yml
index 6c30f36b..7aba5225 100644
--- a/molecule/centos-9/molecule.yml
+++ b/molecule/c9s/molecule.yml
@@ -2,8 +2,8 @@
driver:
name: docker
platforms:
- - name: centos-9
- image: quay.io/ansible-freeipa/upstream-tests:centos-9
+ - name: c9s
+ image: quay.io/ansible-freeipa/upstream-tests:c9s
pre_build_image: true
hostname: ipaserver.test.local
dns_servers:
diff --git a/tests/azure/azure-pipelines.yml b/tests/azure/azure-pipelines.yml
index 199cf8e9..6dc6c762 100644
--- a/tests/azure/azure-pipelines.yml
+++ b/tests/azure/azure-pipelines.yml
@@ -26,7 +26,7 @@ stages:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
- scenario: centos-9
+ scenario: c9s
ansible_version: ">=2.9,<2.10"
# CentOS 8 Stream
diff --git a/tests/azure/build-containers.yml b/tests/azure/build-containers.yml
index 000b542c..e5d8609a 100644
--- a/tests/azure/build-containers.yml
+++ b/tests/azure/build-containers.yml
@@ -35,9 +35,9 @@ jobs:
- template: templates/build_container.yml
parameters:
- job_name_suffix: Centos9
- container_name: centos-9
- build_scenario_name: centos-9-build
+ job_name_suffix: C9S
+ container_name: c9s
+ build_scenario_name: c9s-build
- template: templates/build_container.yml
parameters:
diff --git a/tests/azure/nightly.yml b/tests/azure/nightly.yml
index 32aec971..4578c6a3 100644
--- a/tests/azure/nightly.yml
+++ b/tests/azure/nightly.yml
@@ -54,40 +54,40 @@ stages:
# CentoOS 9 Stream
-- stage: CentOS9_Ansible_2_9
+- stage: c9s_Ansible_2_9
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
- scenario: centos-9
+ scenario: c9s
ansible_version: ">=2.9,<2.10"
-- stage: CentOS9_Ansible_Core_2_11
+- stage: c9s_Ansible_Core_2_11
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
- scenario: centos-9
+ scenario: c9s
ansible_version: "-core >=2.11,<2.12"
-- stage: CentOS9_Ansible_Core_2_12
+- stage: c9s_Ansible_Core_2_12
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
- scenario: centos-9
+ scenario: c9s
ansible_version: "-core >=2.12,<2.13"
-- stage: CentOS9_Ansible_latest
+- stage: c9s_Ansible_latest
dependsOn: []
jobs:
- template: templates/group_tests.yml
parameters:
build_number: $(Build.BuildNumber)
- scenario: centos-9
+ scenario: c9s
ansible_version: ""
# CentOS 8 Stream
--
GitLab