ceph-ansible-nightlies: update nightlies test to fit new needs

update ceph-ansible-nightlies according to new needs for downstream
product

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

diff --git a/ceph-ansible-nightly/build/build b/ceph-ansible-nightly/build/build
index 21e182d912360cba448ccfa3ec98dee5d916f5bd..ad5b0547170878950b9bc2e6f76b9ff7ce7dca04 100644 (file)
--- a/ceph-ansible-nightly/build/build
+++ b/ceph-ansible-nightly/build/build
@@ -14,9 +14,11 @@ clear_libvirt_networks
 restart_libvirt_services
 update_vagrant_boxes
 
-# the $SCENARIO var is injected by the job template. It maps
-# to an actual, defined, tox environment
-if ! timeout 3h $VENV/tox -rv -e=$RELEASE-$ANSIBLE_VERSION-$SCENARIO --workdir=$WORKDIR -- --provider=libvirt; then
-  echo "ERROR: Job didn't complete successfully or got stuck for more than 3h."
-  exit 1
+if [ "$RELEASE" == 'jewel' ] && [ "$CEPH_ANSIBLE_BRANCH" == 'stable-2.2' -o "$CEPH_ANSIBLE_BRANCH" == 'stable-3.0' ]; then
+  start_tox tag-stable-3.0-jewel-centos-7
+elif [ "$RELEASE" == 'luminous' ] && [ "$CEPH_ANSIBLE_BRANCH" == 'stable-3.0' ]; then
+  start_tox tag-stable-3.0-jewel-centos-7
+  start_tox tag-stable-3.0-luminous-centos-7
+elif [ "$RELEASE" == 'luminous' ] && [ "$CEPH_ANSIBLE_BRANCH" == 'master' ]; then
+  start_tox tag-build-master-luminous-ubuntu-16.04
 fi

diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
index d78f0fa6fb5bbd8e2e6045e9039c84588a5ca0a1..5d5338b3dc68af6c6adcee710e4d5fcf86f171aa 100644 (file)
--- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
+++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
@@ -41,7 +41,6 @@
     ceph_ansible_branch:
       - stable-2.2
       - stable-3.0
-      - master
     jobs:
       - 'ceph-ansible-nightly-{release}-{ansible_version}-{ceph_ansible_branch}-{scenario}'
 
@@ -125,6 +124,7 @@
             SCENARIO={scenario}
             RELEASE={release}
             ANSIBLE_VERSION={ansible_version}
+            CEPH_ANSIBLE_BRANCH={ceph_ansible_branch}
       - shell:
           !include-raw-escape:
             - ../../../scripts/build_utils.sh

diff --git a/ceph-ansible-prs/build/build b/ceph-ansible-prs/build/build
index 2ef63acbb9fd9f9ac1906b330e5a193895a27f63..696de61758867ec0fff84692acea92b65ae28ac7 100644 (file)
--- a/ceph-ansible-prs/build/build
+++ b/ceph-ansible-prs/build/build
@@ -26,9 +26,10 @@ for scenario in $scenarios; do
 done
 popd
 
-# the $SCENARIO var is injected by the job template. It maps
-# to an actual, defined, tox environment
-if ! timeout 3h $VENV/tox -rv -e=$RELEASE-$ANSIBLE_VERSION-$SCENARIO --workdir=$WORKDIR -- --provider=libvirt; then
-  echo "ERROR: Job didn't complete successfully or got stuck for more than 3h."
-  exit 1
+if [ "$RELEASE" == 'jewel' ]; then
+  start_tox tag-build-master-jewel-ubuntu-16.04
+elif [ "$RELEASE" == 'luminous' ]; then
+  start_tox tag-build-master-luminous-ubuntu-16.04
+else
+  start_tox latest
 fi

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 37d44a0ef344741833584e99d7d5b22fd5aafc04..91fe0ec4d6264dc4244ad3fa928d398ac474a3a6 100644 (file)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -455,3 +455,12 @@ update_vagrant_boxes() {
         vagrant box prune
     fi
 }
+
+start_tox() {
+# the $SCENARIO var is injected by the job template. It maps
+# to an actual, defined, tox environment
+  if ! CEPH_DOCKER_IMAGE_TAG=$1 timeout 3h $VENV/tox -rv -e=$RELEASE-$ANSIBLE_VERSION-$SCENARIO --workdir=$WORKDIR -- --provider=libvirt; then
+    echo "ERROR: Job didn't complete successfully or got stuck for more than 3h."
+    exit 1
+  fi
+}