Merge "Add docker image tag for euphrates"

diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index ac04962..b28efc3 100644 (file)
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -13,11 +13,11 @@
     # -------------------------------
     # BRANCH ANCHORS
     # -------------------------------
-    master: &master
-      stream: master
-      branch: '{stream}'
-      disabled: false
-      gs-pathname: ''
+    euphrates: &euphrates
+        stream: euphrates
+        branch: 'stable/{stream}'
+        disabled: false
+        gs-pathname: '/{stream}'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -26,19 +26,8 @@
     pod:
       - baremetal:
           slave-label: joid-baremetal
-          <<: *master
-      - virtual:
-          slave-label: joid-virtual
-          <<: *master
-      # -------------------------------
-      #        None-CI PODs
-      # -------------------------------
-      - orange-pod1:
-          slave-label: orange-pod1
-          <<: *master
-      - cengn-pod1:
-          slave-label: cengn-pod1
-          <<: *master
+          <<: *euphrates
+
     # -------------------------------
     # scenarios
     # -------------------------------
@@ -53,18 +42,12 @@
           auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
       - 'os-odl_l2-nofeature-ha':
           auto-trigger-name: 'daily-trigger-disabled'
-      - 'os-onos-nofeature-ha':
-          auto-trigger-name: 'daily-trigger-disabled'
       - 'os-odl_l2-nofeature-noha':
           auto-trigger-name: 'daily-trigger-disabled'
-      - 'os-onos-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
-      - 'os-onos-sfc-ha':
-          auto-trigger-name: 'daily-trigger-disabled'
       - 'os-ocl-nofeature-ha':
-          auto-trigger-name: 'daily-trigger-disabled'
+          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
       - 'os-ocl-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
+          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
       - 'k8-nosdn-nofeature-noha':
           auto-trigger-name: 'daily-trigger-disabled'
       - 'k8-nosdn-lb-noha':
@@ -151,7 +134,7 @@
               build-step-failure-threshold: 'never'
               failure-threshold: 'never'
               unstable-threshold: 'FAILURE'
-# 1.dovetail only master by now, not sync with A/B/C branches
+# 1.dovetail only euphrates by now, not sync with A/B/C branches
 # 2.here the stream means the SUT stream, dovetail stream is defined in
 #   its own job
 # 3.only debug testsuite here(includes basic testcase,
@@ -234,191 +217,58 @@
 ########################
 # trigger macros
 ########################
-# os-nosdn-nofeature-ha trigger - branch: master
+# os-nosdn-nofeature-ha trigger - branch: euphrates
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 2 * * *'
+# os-odl_l2-nofeature-ha trigger - branch: euphrates
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-nofeature-ha-orange-pod1-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-nofeature-ha-cengn-pod1-master-trigger'
-    triggers:
-      - timed: ''
-# os-odl_l2-nofeature-ha trigger - branch: master
-- trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 7 * * *'
+# os-nosdn-lxd-noha trigger - branch: euphrates
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-cengn-pod1-master-trigger'
-    triggers:
-      - timed: ''
-# os-onos-nofeature-ha trigger - branch: master
-- trigger:
-    name: 'joid-os-onos-nofeature-ha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 12 * * *'
-- trigger:
-    name: 'joid-os-onos-nofeature-ha-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-onos-nofeature-ha-orange-pod1-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-onos-nofeature-ha-cengn-pod1-master-trigger'
-    triggers:
-      - timed: ''
-# os-onos-sfc-ha trigger - branch: master
-- trigger:
-    name: 'joid-os-onos-sfc-ha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 17 * * *'
-- trigger:
-    name: 'joid-os-onos-sfc-ha-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-onos-sfc-ha-orange-pod1-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-onos-sfc-ha-cengn-pod1-master-trigger'
-    triggers:
-      - timed: ''
-# os-nosdn-lxd-noha trigger - branch: master
-- trigger:
-    name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger'
+    name: 'joid-os-nosdn-lxd-noha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 22 * * *'
+# os-nosdn-lxd-ha trigger - branch: euphrates
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-lxd-noha-orange-pod1-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-lxd-noha-cengn-pod1-master-trigger'
-    triggers:
-      - timed: ''
-# os-nosdn-lxd-ha trigger - branch: master
-- trigger:
-    name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger'
+    name: 'joid-os-nosdn-lxd-ha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 10 * * *'
+# os-nosdn-nofeature-noha trigger - branch: euphrates
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-lxd-ha-orange-pod1-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-lxd-ha-cengn-pod1-master-trigger'
-    triggers:
-      - timed: ''
-# os-nosdn-nofeature-noha trigger - branch: master
-- trigger:
-    name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 4 * * *'
+# k8-nosdn-nofeature-noha trigger - branch: euphrates
 - trigger:
-    name: 'joid-os-nosdn-nofeature-noha-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-nofeature-noha-orange-pod1-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-nofeature-noha-cengn-pod1-master-trigger'
-    triggers:
-      - timed: ''
-# k8-nosdn-nofeature-noha trigger - branch: master
-- trigger:
-    name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger'
+    name: 'joid-k8-nosdn-nofeature-noha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 15 * * *'
+# k8-nosdn-lb-noha trigger - branch: euphrates
 - trigger:
-    name: 'joid-k8-nosdn-nofeature-noha-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-k8-nosdn-nofeature-noha-orange-pod1-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-k8-nosdn-nofeature-noha-cengn-pod1-master-trigger'
-    triggers:
-      - timed: ''
-# k8-nosdn-lb-noha trigger - branch: master
-- trigger:
-    name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger'
+    name: 'joid-k8-nosdn-lb-noha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 20 * * *'
+# k8-ovn-lb-noha trigger - branch: euphrates
 - trigger:
-    name: 'joid-k8-nosdn-lb-noha-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-k8-nosdn-lb-noha-orange-pod1-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-k8-nosdn-lb-noha-cengn-pod1-master-trigger'
-    triggers:
-      - timed: ''
-# k8-ovn-lb-noha trigger - branch: master
-- trigger:
-    name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger'
+    name: 'joid-k8-ovn-lb-noha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 17 * * *'
+# os-nosdn-openbaton-ha trigger - branch: euphrates
 - trigger:
-    name: 'joid-k8-ovn-lb-noha-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-k8-ovn-lb-noha-orange-pod1-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-k8-ovn-lb-noha-cengn-pod1-master-trigger'
-    triggers:
-      - timed: ''
-
-# os-nosdn-openbaton-ha trigger - branch: master
-- trigger:
-    name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
+    name: 'joid-os-nosdn-openbaton-ha-baremetal-euphrates-trigger'
     triggers:
       - timed: '5 25 * * *'
+# os-ocl-nofeature-ha trigger - branch: euphrates
 - trigger:
-    name: 'joid-os-nosdn-openbaton-ha-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'joid-os-nosdn-openbaton-ha-orange-pod1-master-trigger'
+    name: 'joid-os-ocl-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-      - timed: ''
+      - timed: '5 13 * * *'
+# os-ocl-nofeature-ha trigger - branch: euphrates
 - trigger:
-    name: 'joid-os-nosdn-openbaton-ha-cengn-pod1-master-trigger'
+    name: 'joid-os-ocl-nofeature-noha-baremetal-euphrates-trigger'
     triggers:
-      - timed: ''
+      - timed: '5 17 * * *'

diff --git a/jjb/qtip/qtip-verify-jobs.yml b/jjb/qtip/qtip-verify-jobs.yml
index a919728..047d7f2 100644 (file)
--- a/jjb/qtip/qtip-verify-jobs.yml
+++ b/jjb/qtip/qtip-verify-jobs.yml
@@ -8,8 +8,8 @@
     project: qtip
     jobs:
       - 'qtip-verify-{stream}'
-      - 'qtip-review-notebook-{stream}'
-      - 'qtip-merge-{stream}'
+      - 'qtip-verify-notebook-{stream}'
+      - 'qtip-merged-notebook-{stream}'
     stream:
       - master:
           branch: '{stream}'
@@ -69,7 +69,7 @@
 
 # upload juypter notebook to artifacts for review
 - job-template:
-    name: 'qtip-review-notebook-{stream}'
+    name: 'qtip-verify-notebook-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -104,14 +104,14 @@
               disable-strict-forbidden-file-verification: 'true'
               file-paths:
                 - compare-type: ANT
-                  pattern: 'examples/**'
+                  pattern: '**/*.ipynb'
 
     builders:
       - upload-under-review-notebooks-to-opnfv-artifacts
       - report-build-result-to-gerrit
 
 - job-template:
-    name: 'qtip-merge-{stream}'
+    name: 'qtip-merged-notebook-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -146,7 +146,7 @@
                   branch-pattern: '**/{branch}'
               file-paths:
                 - compare-type: ANT
-                  pattern: examples/**
+                  pattern: '**/*ipynb'
 
     builders:
       - remove-old-docs-from-opnfv-artifacts
@@ -178,7 +178,6 @@
           export PATH=$PATH:/usr/local/bin/
 
           [[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
-          [[ -d examples ]] || exit 0
 
           echo
           echo "###########################"
@@ -190,8 +189,9 @@
           gs_path="$gs_base/$GERRIT_CHANGE_NUMBER"
           local_path="upload/$GERRIT_CHANGE_NUMBER"
 
-          mkdir -p upload
-          cp -r examples "$local_path"
+          mkdir -p $local_path
+
+          git diff HEAD~1 --name-only | grep -E ".+\.ipynb$" | xargs -I '{}' cp '{}' $local_path
           gsutil -m cp -r "$local_path" "gs://$gs_base/"
 
           echo "Document link(s):" >> gerrit_comment.txt

diff --git a/jjb/releng/opnfv-docker-arm.yml b/jjb/releng/opnfv-docker-arm.yml
index a3c774e..987eb4b 100644 (file)
--- a/jjb/releng/opnfv-docker-arm.yml
+++ b/jjb/releng/opnfv-docker-arm.yml
@@ -151,6 +151,10 @@
             arch_tag: 'aarch64'
             <<: *euphrates
             <<: *storperf-arm-receivers
+        - 'yardstick':
+            project: 'yardstick'
+            <<: *euphrates
+            <<: *yardstick-arm-receivers
 
     jobs:
         - '{dockerrepo}-docker-build-arm-push-{stream}'

diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index b03505e..954d7c8 100644 (file)
--- a/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@ -17,17 +17,6 @@ echo "Starting opnfv-docker for $DOCKER_REPO_NAME ..."
 echo "--------------------------------------------------------"
 echo
 
-count=30 # docker build jobs might take up to ~30 min
-while [[ -n `ps -ef|grep 'docker build'|grep -v grep` ]]; do
-    echo "Build in progress. Waiting..."
-    sleep 60
-    count=$(( $count - 1 ))
-    if [ $count -eq 0 ]; then
-        echo "Timeout. Aborting..."
-        exit 1
-    fi
-done
-
 # Remove previous running containers if exist
 if [[ -n "$(docker ps -a | grep $DOCKER_REPO_NAME)" ]]; then
     echo "Removing existing $DOCKER_REPO_NAME containers..."

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 088c510..373c386 100644 (file)
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -111,7 +111,7 @@
             <<: *other-receivers
         - 'yardstick':
             project: 'yardstick'
-            <<: *danube
+            <<: *euphrates
             <<: *other-receivers
         # projects with jobs for euphrates
         - 'functest':

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index aac89f2..0e79bd9 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -231,6 +231,29 @@
             fi
 
             cd $WORKSPACE
+
+            # The start-new-vm.sh script will copy the entire releng-xci directory
+            # so lets prepare the test script now so it can be copied by the script.
+            # Please do not move it elsewhere or you would have to move it to the VM
+            # yourself.
+            cat > xci_test.sh<<EOF
+            #!/bin/bash
+            export DISTRO=$DISTRO
+            export DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+            export FUNCTEST_MODE=$FUNCTEST_MODE
+            export FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
+            export XCI_FLAVOR=$XCI_FLAVOR
+            export CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+            export OPNFV_RELENG_DEV_PATH=/home/devuser/releng-xci/
+            export INSTALLER_TYPE=$INSTALLER_TYPE
+            export GIT_BASE=$GIT_BASE
+            export JENKINS_HOME=$JENKINS_HOME
+
+            cd xci
+            ./xci-deploy.sh
+            EOF
+            chmod a+x xci_test.sh
+
             ./xci/scripts/vm/start-new-vm.sh $DISTRO
         - shell: |
             #!/bin/bash
@@ -241,7 +264,7 @@
                 exit 0
             fi
 
-            ssh ${DISTRO}_xci_vm "cd releng-xci/xci && ./xci-deploy.sh"
+            ssh ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh"
 
 
 - builder: