Apex: Allow CSIT for any ODL project

Instead of just netvirt, enable other ODL projects to trigger OPNFV
CSIT.

Change-Id: Ia394ed084108c44d68317b7e38cfb43d090ca784
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/jjb/3rd_party_ci/download-netvirt-artifact.sh b/jjb/3rd_party_ci/download-netvirt-artifact.sh
index b1f977a..7cdd52d 100755 (executable)
--- a/jjb/3rd_party_ci/download-netvirt-artifact.sh
+++ b/jjb/3rd_party_ci/download-netvirt-artifact.sh
@@ -13,19 +13,18 @@ fi
 
 echo "ODL Distribution is ${DIST}"
 ODL_ZIP="karaf-SNAPSHOT.zip"
 
 echo "ODL Distribution is ${DIST}"
 ODL_ZIP="karaf-SNAPSHOT.zip"

-CHANGE_DETAILS_URL="https://git.opendaylight.org/gerrit/changes/netvirt~${ODL_BRANCH}~${GERRIT_CHANGE_ID}/detail"
+CHANGE_DETAILS_URL="https://git.opendaylight.org/gerrit/changes/${GERRIT_PROJECT}~${ODL_BRANCH}~${GERRIT_CHANGE_ID}/detail"

 # due to limitation with the Jenkins Gerrit Trigger, we need to use Gerrit REST API to get the change details
 # due to limitation with the Jenkins Gerrit Trigger, we need to use Gerrit REST API to get the change details

-ODL_BUILD_JOB_NUM=$(curl --fail ${CHANGE_DETAILS_URL} | grep -Eo "netvirt-distribution-check-${DIST}/[0-9]+" | tail -1 | grep -Eo [0-9]+)
-DISTRO_CHECK_CONSOLE_LOG="https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1/netvirt-distribution-check-${DIST}/${ODL_BUILD_JOB_NUM}/console.log.gz"
+ODL_BUILD_JOB_NUM=$(curl --fail ${CHANGE_DETAILS_URL} | grep -Eo "${GERRIT_PROJECT}-distribution-check-${DIST}/[0-9]+" | tail -1 | grep -Eo [0-9]+)
+DISTRO_CHECK_CONSOLE_LOG="https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1/${GERRIT_PROJECT}-distribution-check-${DIST}/${ODL_BUILD_JOB_NUM}/console.log.gz"

 NETVIRT_ARTIFACT_URL=$(curl --fail --compressed ${DISTRO_CHECK_CONSOLE_LOG} | grep 'BUNDLE_URL' | cut -d = -f 2)
 
 echo -e "URL to artifact is\n\t$NETVIRT_ARTIFACT_URL"
 
 echo "Downloading the artifact. This could take time..."
 NETVIRT_ARTIFACT_URL=$(curl --fail --compressed ${DISTRO_CHECK_CONSOLE_LOG} | grep 'BUNDLE_URL' | cut -d = -f 2)
 
 echo -e "URL to artifact is\n\t$NETVIRT_ARTIFACT_URL"
 
 echo "Downloading the artifact. This could take time..."

-wget -q -O $ODL_ZIP $NETVIRT_ARTIFACT_URL
-if [[ $? -ne 0 ]]; then
+if ! wget -q -O $ODL_ZIP $NETVIRT_ARTIFACT_URL; then

     echo "The artifact does not exist! Probably removed due to ODL Jenkins artifact retention policy."
     echo "The artifact does not exist! Probably removed due to ODL Jenkins artifact retention policy."

-    echo "Rerun netvirt-patch-test-current-carbon to get artifact rebuilt."
+    echo "Use 'recheck' on the gerrit to get artifact rebuilt."

     exit 1
 fi
 
     exit 1
 fi
 

diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml
index bb7d21e..28b0ead 100644 (file)
--- a/jjb/3rd_party_ci/odl-netvirt.yaml
+++ b/jjb/3rd_party_ci/odl-netvirt.yaml
@@ -142,6 +142,7 @@
                 GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
                 GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
                 GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION
                 GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID
                 GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER
                 GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION

+                GERRIT_PROJECT=$GERRIT_PROJECT

                 NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
                 TOPOLOGY=$TOPOLOGY
                 OS_VERSION=$OS_VERSION
                 NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT
                 TOPOLOGY=$TOPOLOGY
                 OS_VERSION=$OS_VERSION