From 74e7df112a5c301b8b2d1de848a9406c29b230cb Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 8 Oct 2019 18:12:09 +0200 Subject: [PATCH] ceph-ansible: don't run podman on stable-3.2 skip podman job when target branch is stable-3.2 since it doesn't support podman. Signed-off-by: Guillaume Abrioux --- ceph-ansible-prs/build/build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ceph-ansible-prs/build/build b/ceph-ansible-prs/build/build index 7d3f90b7..8e73a916 100644 --- a/ceph-ansible-prs/build/build +++ b/ceph-ansible-prs/build/build @@ -28,7 +28,5 @@ popd # In the same logic, clean fact cache rm -rf $HOME/ansible/facts/* -# stable-3.0 doesn't have ceph-volume and therefore doesn't support LVM scenarios. -# Rather than running a bunch of conditional steps in the pipeline to check if -# a PR is merging into the stable-3.0 branch, we'll just pass LVM jobs. -[[ "$ghprbTargetBranch" == "stable-3.0" && "$SCENARIO" == *"lvm"* ]] || start_tox +# stable-3.2 doesn't support podman. +[[ "$ghprbTargetBranch" == "stable-3.2" && "$SCENARIO" == "podman" ]] || start_tox -- 2.39.5