From 54ed76efcf9b956079daf22669dbfc14b6114224 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 9 Oct 2019 07:10:46 +0200 Subject: [PATCH] ceph-ansible-prs: don't display podman job on github on stable-3.2 This should avoid to display this job on the github status. Signed-off-by: Guillaume Abrioux --- ceph-ansible-prs/build/build | 3 --- ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ceph-ansible-prs/build/build b/ceph-ansible-prs/build/build index 8e73a916..e155b1a0 100644 --- a/ceph-ansible-prs/build/build +++ b/ceph-ansible-prs/build/build @@ -27,6 +27,3 @@ done popd # In the same logic, clean fact cache rm -rf $HOME/ansible/facts/* - -# stable-3.2 doesn't support podman. -[[ "$ghprbTargetBranch" == "stable-3.2" && "$SCENARIO" == "podman" ]] || start_tox diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml index cf9e45e7..f789aa9f 100644 --- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml +++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml @@ -134,6 +134,14 @@ echo "Only docs were modified. Skipping the rest of the job." exit 1 fi + if [[ "$ghprbTargetBranch" =~ stable-3. && "$SCENARIO" == "podman" ]]; then + echo "This scenario isn't available on this branch." + exit 1 + fi + if [[ "$ghprbTargetBranch" == stable-3.1 && "$SCENARIO" =~ lvm_batch|lvm_osds ]]; then + echo "This scenario isn't available on this branch." + exit 1 + fi on-evaluation-failure: dont-run steps: - shell: -- 2.39.5