From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 9 Oct 2019 06:53:19 +0000 (+0200)
Subject: ceph-ansible-prs: revert commit 54ed76efcf9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5d82fcaf3b8e0b8e10e48498034c36161f4457cb;p=ceph-build.git

ceph-ansible-prs: revert commit 54ed76efcf9

This approach doesn't work as expected, it skips almost all jobs.
Setting back the condition in the build script until we figure out
something better.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/ceph-ansible-prs/build/build b/ceph-ansible-prs/build/build
index e155b1a0..ed377d8a 100644
--- a/ceph-ansible-prs/build/build
+++ b/ceph-ansible-prs/build/build
@@ -27,3 +27,8 @@ done
 popd
 # In the same logic, clean fact cache
 rm -rf $HOME/ansible/facts/*
+
+# Skip these scenarios, they don't exist.
+[[ "$ghprbTargetBranch" == stable-3.1 && "$SCENARIO" =~ lvm_batch|lvm_osds ]] ||
+[[ "$ghprbTargetBranch" =~ stable-3 && "$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 49786907..cf9e45e7 100644
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -134,14 +134,6 @@
               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: