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 c333ec41c611a4a4ed8b8a77069f9dcdb6adf53a..dfa654804578e69905903a8726141e4ac1b87c00 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 6c30f36badf81ca893f53b313497614332b6b895..7aba52252912d9709c9ce604911c6554ce406347 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 199cf8e98ed20616a3028129e67191e1006c7ef4..6dc6c7627762d7f608591269b97e041aacc389a7 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 000b542c0e0aa4f27fc4ba3ab91d2b8a588742ce..e5d8609a0e33893c1f779494979cae677ee4f86b 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 32aec971ecef412dd4f6439e1d12000c8b62daa3..4578c6a331158c3855727c2f433587328582b8d0 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