Merge "openci: Further filter triggering events based on scenario for ODL and ONAP"

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yaml b/jjb/daisy4nfv/daisy-daily-jobs.yaml
index 1769bb4..ba03bc3 100644 (file)
--- a/jjb/daisy4nfv/daisy-daily-jobs.yaml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yaml
@@ -18,13 +18,13 @@
     master: &master
       stream: master
       branch: '{stream}'
-      disabled: false
+      disabled: true
       gs-pathname: ''
     fraser: &fraser
       stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
-      disabled: false
+      disabled: true
 
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING

diff --git a/jjb/daisy4nfv/daisy-project-jobs.yaml b/jjb/daisy4nfv/daisy-project-jobs.yaml
index cb0dea1..ec5ba71 100644 (file)
--- a/jjb/daisy4nfv/daisy-project-jobs.yaml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yaml
@@ -20,11 +20,11 @@
       - master:
           branch: '{stream}'
           gs-pathname: ''
-          disabled: false
+          disabled: true
       - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
-          disabled: false
+          disabled: true
 
     phase:
       - 'build':

diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
index 3a0a59f..7e03fab 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
@@ -18,11 +18,11 @@
       - master:
           branch: '{stream}'
           gs-pathname: ''
-          disabled: false
+          disabled: true
       - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
-          disabled: false
+          disabled: true
     #####################################
     # patch merge phases
     #####################################

diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml
index 777b677..033beeb 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yaml
@@ -15,11 +15,11 @@
       - master:
           branch: '{stream}'
           gs-pathname: ''
-          disabled: false
+          disabled: true
       - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
-          disabled: false
+          disabled: true
 
     #####################################
     # patch verification phases

diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index 5c8cafb..c89938b 100644 (file)
--- a/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@ -78,7 +78,14 @@ echo "Current branch: $BRANCH"
 BUILD_BRANCH=$BRANCH
 
 GERRIT_REFNAME=${GERRIT_REFNAME:-''}
-RELEASE_VERSION=${GERRIT_REFNAME/refs\/tags//}
+RELEASE_VERSION=${GERRIT_REFNAME/refs\/tags\/}
+
+# If we're being triggered by a comment-added job, then extract the tag
+# from the comment and use that as the release version.
+# Expected comment format: retag opnfv-x.y.z
+if [[ "$GERRIT_EVENT_TYPE" == "comment-added" ]]; then
+    RELEASE_VERSION=$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'retag' | awk '{print $2}')
+fi
 
 if [[ "$BRANCH" == "master" ]]; then
     DOCKER_TAG="latest"