From d4e62125fa2fca12ff6bd6f9a3b3dc3b12d4cd64 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 27 Apr 2023 09:43:18 +0200 Subject: [PATCH] cephadm-ansible: add el9 testing el9 RPMs weren't available so `el9` distribution was left commented out so far. Given that we now have el9 packages, let's add el9 testing. Signed-off-by: Guillaume Abrioux --- cephadm-ansible-prs/build/build | 3 +++ cephadm-ansible-prs/config/definitions/cephadm-ansible-prs.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cephadm-ansible-prs/build/build b/cephadm-ansible-prs/build/build index dc26f8e3..4b68f9d1 100644 --- a/cephadm-ansible-prs/build/build +++ b/cephadm-ansible-prs/build/build @@ -25,4 +25,7 @@ else ENVIRONMENT="${SCENARIO}" fi +# Skip the following scenarios as they are not valid: + +[[ "$ghprbTargetBranch" == pacific && "$DISTRIBUTION" == el9 ]] || "${VENV}"/tox --workdir="${TEMPVENV}" -c tox.ini -e "${ENVIRONMENT}" -r -v -- --provider=libvirt diff --git a/cephadm-ansible-prs/config/definitions/cephadm-ansible-prs.yml b/cephadm-ansible-prs/config/definitions/cephadm-ansible-prs.yml index e5171364..5db32a6e 100644 --- a/cephadm-ansible-prs/config/definitions/cephadm-ansible-prs.yml +++ b/cephadm-ansible-prs/config/definitions/cephadm-ansible-prs.yml @@ -13,7 +13,7 @@ worker_labels: 'vagrant && libvirt && (braggi || adami)' distribution: - el8 - # - el9 + - el9 scenario: - functional jobs: -- 2.47.3