]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-volume: fix nautilus PRs job 1710/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Mon, 23 Nov 2020 16:06:34 +0000 (17:06 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 23 Nov 2020 16:06:34 +0000 (17:06 +0100)
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 <gabrioux@redhat.com>
ceph-volume-ansible-prs/build/build

index 1e3f1efb618971ece9eaaeac33fd16781d9aa283..e752d1df5ed12a275b8e23903e851b55e4d58a8c 100644 (file)
@@ -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