Merge "Stop maintaining Euphrates (EOL)"

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 2380932..8497203 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -523,7 +523,7 @@
       - multijob:
           name: apex-fetch-logs
           projects:
-            - name: 'apex-fetch-logs'
+            - name: 'apex-fetch-logs-{scenario_stream}'
               current-parameters: true
               predefined-parameters: |
                 GERRIT_BRANCH=$GERRIT_BRANCH

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 5965efe..dac7c3a 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -401,7 +401,7 @@
       - multijob:
           name: apex-fetch-logs
           projects:
-            - name: 'apex-fetch-logs'
+            - name: 'apex-fetch-logs-{scenario_stream}'
               current-parameters: true
               predefined-parameters: |
                 GERRIT_BRANCH=$GERRIT_BRANCH

diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 52b1c79..0fe76f0 100644 (file)
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -86,25 +86,25 @@
       - 'clover-ns-nginx-lb':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/lb/Dockerfile'
+          dockerfile: 'subservices/lb/Dockerfile'
           <<: *master
           <<: *other-receivers
       - 'clover-ns-nginx-proxy':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/proxy/Dockerfile'
+          dockerfile: 'subservices/proxy/Dockerfile'
           <<: *master
           <<: *other-receivers
       - 'clover-ns-nginx-server':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/server/Dockerfile'
+          dockerfile: 'subservices/server/Dockerfile'
           <<: *master
           <<: *other-receivers
       - 'clover-ns-snort-ids':
           project: 'clover'
           dockerdir: 'samples/services/snort_ids/docker'
-          dockerfile: 'samples/services/snort_ids/docker/Dockerfile'
+          dockerfile: 'Dockerfile'
           <<: *master
           <<: *other-receivers
       - 'cperf':
@@ -228,25 +228,25 @@
       - 'clover-ns-nginx-lb':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/lb/Dockerfile'
+          dockerfile: 'subservices/lb/Dockerfile'
           <<: *fraser
           <<: *other-receivers
       - 'clover-ns-nginx-proxy':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/proxy/Dockerfile'
+          dockerfile: 'subservices/proxy/Dockerfile'
           <<: *fraser
           <<: *other-receivers
       - 'clover-ns-nginx-server':
           project: 'clover'
           dockerdir: 'samples/services/nginx/docker'
-          dockerfile: 'samples/services/nginx/docker/subservices/server/Dockerfile'
+          dockerfile: 'subservices/server/Dockerfile'
           <<: *fraser
           <<: *other-receivers
       - 'clover-ns-snort-ids':
           project: 'clover'
           dockerdir: 'samples/services/snort_ids/docker'
-          dockerfile: 'samples/services/snort_ids/docker/Dockerfile'
+          dockerfile: 'Dockerfile'
           <<: *fraser
           <<: *other-receivers
     # yamllint enable rule:key-duplicates

diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index 9d524bc..c810212 100755 (executable)
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -27,6 +27,9 @@ set -o nounset
 set -o pipefail
 
 cd ~/bifrost
+# set path for XCI repository
+export XCI_PATH=~/bifrost/releng-xci
+
 # provision 3 VMs; xcimaster, controller, and compute
 ./scripts/bifrost-provision.sh | ts
 

diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh
index 7fb0be9..3ae6a8d 100755 (executable)
--- a/jjb/xci/xci-run-functest.sh
+++ b/jjb/xci/xci-run-functest.sh
@@ -52,8 +52,22 @@ echo "Running functest"
 ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/run-functest.sh"
 # Record exit code
 functest_exit=$?
+
+case ${DEPLOY_SCENARIO[0]} in
+    os-*)
+        FUNCTEST_LOG=/root/results/functest.log
+        ;;
+    k8-*)
+        FUNCTEST_LOG=/root/results/functest-kubernetes.log
+        ;;
+    *)
+        echo "Unable to determine the installer. Exiting!"
+        exit 1
+        ;;
+esac
+
 echo "Functest log"
 echo "---------------------------------------------------------------------------------"
-ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "cat /root/results/functest.log"
+ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "cat $FUNCTEST_LOG"
 echo "---------------------------------------------------------------------------------"
 exit ${functest_exit}

diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh
index b591dd2..c28093d 100755 (executable)
--- a/jjb/xci/xci-set-scenario.sh
+++ b/jjb/xci/xci-set-scenario.sh
@@ -96,22 +96,26 @@ function determine_generic_scenario() {
     # get the changeset
     cd $WORKSPACE
     SCENARIOS=$(git diff HEAD^..HEAD --name-only -- 'xci/scenarios' | cut -d "/" -f 3 | uniq)
-    # We need to set default scenario for changes that do not mess with scenarios
-    NO_SCENARIOS=$(git diff HEAD^..HEAD --name-only | grep -v 'xci/scenarios' | cut -d "/" -f 3 | uniq)
+    # We need to set default scenario for changes that mess with installers
+    INSTALLERS=$(git diff HEAD^..HEAD --name-only -- 'xci/installer' | cut -d "/" -f 3 | uniq)
     for CHANGED_SCENARIO in $SCENARIOS; do
-        [[ ${DEPLOY_SCENARIO[@]} =~ $CHANGED_SCENARIO ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]=$CHANGED_SCENARIO
+        DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]=$CHANGED_SCENARIO
     done
-    for CHANGED_FILE in $NO_SCENARIOS; do
-        case $CHANGED_FILE in
+    for CHANGED_INSTALLER in $INSTALLERS; do
+        case $CHANGED_INSTALLER in
             kubespray)
-                [[ ${DEPLOY_SCENARIO[@]} =~ "k8-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='k8-nosdn-nofeature'
+                DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='k8-nosdn-nofeature'
                 ;;
             # Default case (including OSA changes)
             *)
-                [[ ${DEPLOY_SCENARIO[@]} =~ "os-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature'
+                DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature'
                 ;;
         esac
     done
+    # For all other changes, we only need to set a default scenario if it's not set already
+    if git diff HEAD^..HEAD --name-only | grep -q -v 'xci/installer\|xci/scenario'; then
+         [[ ${#DEPLOY_SCENARIO[@]} -eq 0 ]] && DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature'
+    fi
 
     # extract releng-xci sha
     XCI_SHA=$(cd $WORKSPACE && git rev-parse HEAD)