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 e155b1a08075d29bcddf2c7cbbfea57126b0a12d..ed377d8a09e3cf5cbee14d69e0d34d34578d26a4 100644 (file)
--- 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 497869074465376a55d865b638ec072c0df47f1d..cf9e45e7e72804b0f4850662a8f26185029e9ac7 100644 (file)
--- 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: