From 8eebefd788ddc6cc4dda77ece90d96c375433bc8 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 23 Nov 2020 17:06:34 +0100 Subject: [PATCH] ceph-volume: fix nautilus PRs job ceph-volume PRs against nautilus are failing for a while because it tries to run against centos8 while the tox environment only defines centos7 environments. Let's enforce `DISTRO` environment variable when `ghprbTargetBranch` is `nautilus` so we override the environment variable injected by Jenkins. Signed-off-by: Guillaume Abrioux --- ceph-volume-ansible-prs/build/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ceph-volume-ansible-prs/build/build b/ceph-volume-ansible-prs/build/build index 1e3f1efb..e752d1df 100644 --- a/ceph-volume-ansible-prs/build/build +++ b/ceph-volume-ansible-prs/build/build @@ -30,6 +30,10 @@ else CEPH_ANSIBLE_BRANCH="master" fi +if [[ "$ghprbTargetBranch" == "nautilus" ]]; then + DISTRO="centos7" +fi + CEPH_ANSIBLE_BRANCH=$CEPH_ANSIBLE_BRANCH CEPH_DEV_BRANCH=$ghprbTargetBranch $VENV/tox --workdir=$WORKDIR -vre $DISTRO-$OBJECTSTORE-$SCENARIO -- --provider=libvirt GITHUB_STATUS_STATE="success" $VENV/github-status create -- 2.39.5