From: Fatih Degirmenci <fdegir@gmail.com>
Date: Mon, 14 May 2018 08:46:55 +0000 (+0000)
Subject: Merge "Releng PTL change to Trevor Bramwell"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c771f89e9cc24fd1b6cf5f775086acb5c3841e06;hp=30e4fc97a5fd9291c4710ab5423e2d8eaa1154a9;p=releng.git

Merge "Releng PTL change to Trevor Bramwell"
---

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 88fb02605..8eeaabfaa 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -162,8 +162,6 @@
           block-level: 'NODE'
 
     wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
       - fix-workspace-permissions
 
     parameters:
@@ -174,7 +172,6 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
-          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
@@ -362,7 +359,6 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
-          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
@@ -409,10 +405,10 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
-          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
+
     scm:
       - git-scm
 
@@ -457,7 +453,7 @@
           description: "Directory where the logs will be located upon the completion of the collection."
       - string:
           name: DEPLOY_SCENARIO
-          default: '{scenario}'
+          default: 'os-nosdn-nofeature-ha'
           description: "Scenario to deploy with."
       - string:
           name: COMPASS_OS_VERSION
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index a5148cde9..9616fb310 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -81,6 +81,7 @@ if [[ -f $OPENRC ]]; then
             exit 1
         fi
     fi
+    echo "export EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" >> ${OPENRC}
 else
     echo "ERROR: cannot find file $OPENRC. Please check if it is existing."
     sudo ls -al ${DOVETAIL_CONFIG}
@@ -322,14 +323,16 @@ docker exec $container_id ${run_cmd}
 
 sudo cp -r ${DOVETAIL_HOME}/results ./
 # To make sure the file owner is the current user, for the copied results files in the above line
-# if not, there will be error when next time to wipe workspace
+echo "Change owner of result files ..."
 CURRENT_USER=${SUDO_USER:-$USER}
 PRIMARY_GROUP=$(id -gn $CURRENT_USER)
-sudo chown -R ${CURRENT_USER}:${PRIMARY_GROUP} ${WORKSPACE}/results
+echo "Current user is ${CURRENT_USER}, group is ${PRIMARY_GROUP}"
+sudo chown -R ${CURRENT_USER}:${PRIMARY_GROUP} ./results
 
 #remove useless files to save disk space
 sudo rm -rf ./results/workspace
 sudo rm -f ./results/yardstick.img
+sudo rm -f ./results/tmp*
 
 echo "Dovetail: done!"
 
diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index e4e5705a7..2d112c7e5 100644
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -90,7 +90,7 @@
                 - compare-type: ANT
                   pattern: 'INFO.yaml'
             - project-compare-type: 'REG_EXP'
-              project-pattern: 'sfc|sdnvpn'
+              project-pattern: 'sfc|sdnvpn|releng-xci-scenarios'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh
index dd953e927..174932813 100755
--- a/jjb/xci/xci-start-new-vm.sh
+++ b/jjb/xci/xci-start-new-vm.sh
@@ -68,14 +68,23 @@ export BUILD_TAG=$BUILD_TAG
 export NODE_NAME=$NODE_NAME
 
 if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then
-    git clone https://gerrit.opnfv.org/gerrit/$GERRIT_PROJECT xci/scenarios/$DEPLOY_SCENARIO && cd xci/scenarios/$DEPLOY_SCENARIO
-    git fetch https://gerrit.opnfv.org/gerrit/$GERRIT_PROJECT $GERRIT_REFSPEC && git checkout FETCH_HEAD
-    cd -
+    export XCI_ANSIBLE_PARAMS="-e @/home/devuser/releng-xci/scenario_overrides.yml"
 fi
 
 cd xci
 ./xci-deploy.sh | ts
 EOF
+
+if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then
+    cat > scenario_overrides.yml <<-EOF
+---
+xci_scenarios_overrides:
+  - scenario: $DEPLOY_SCENARIO
+    version: $GERRIT_PATCHSET_REVISION
+    refspec: $GERRIT_REFSPEC
+EOF
+fi
+
 chmod a+x xci_test.sh
 
 export XCI_BUILD_CLEAN_VM_OS=false
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index e5c1a9394..3b7df62f4 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -117,7 +117,7 @@
                 - compare-type: ANT
                   pattern: 'upstream/**'
             - project-compare-type: 'REG_EXP'
-              project-pattern: 'sfc|sdnvpn'
+              project-pattern: 'sfc|sdnvpn|releng-xci-scenarios'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'