Merge "xci: Do not trigger merge jobs for INFO.yaml updates"

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 1c53dbe..d011283 100755 (executable)
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -95,7 +95,7 @@ cat $OPENRC
 if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == "compass" ]]; then
     compass_repo=${WORKSPACE}/compass4nfv/
     git clone https://github.com/opnfv/compass4nfv.git ${compass_repo} >/dev/null
-    pip install shyaml
+    sudo pip install shyaml
     scenario_file=${compass_repo}/deploy/conf/hardware_environment/$NODE_NAME/os-nosdn-nofeature-ha.yml
     ipmiIp=$(cat ${scenario_file} | shyaml get-value hosts.0.ipmiIp)
     ipmiPass=$(cat ${scenario_file} | shyaml get-value hosts.0.ipmiPass)
@@ -165,7 +165,7 @@ if [[ ! -f ${DOVETAIL_CONFIG}/pod.yaml ]]; then
 fi
 
 if [ -f ${DOVETAIL_CONFIG}/pod.yaml ]; then
-    sudo chown jenkins:jenkins ${DOVETAIL_CONFIG}/pod.yaml
+    sudo chmod 666 ${DOVETAIL_CONFIG}/pod.yaml
     echo "Adapt process info for $INSTALLER_TYPE ..."
     attack_process='rabbitmq'
     cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index bdd79c4..dfadf9a 100755 (executable)
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -162,7 +162,7 @@ if [ "${INSTALLER_TYPE}" == 'fuel' ]; then
 fi
 
 
-if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'odl.*sfc' ]]; then
+if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then
     ssh_key="/tmp/id_rsa"
     user_config="/tmp/openstack_user_config.yml"
     docker cp compass-tasks:/root/.ssh/id_rsa $ssh_key

diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index 9219d00..9d524bc 100755 (executable)
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -17,7 +17,7 @@ cd $WORKSPACE
 git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD
 
 # combine opnfv and upstream scripts/playbooks
-/bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE/
+/bin/cp -rf $WORKSPACE/releng-xci/xci/infra/bifrost/* $WORKSPACE/
 
 cd $WORKSPACE/releng-xci
 cat > bifrost_test.sh<<EOF

diff --git a/jjb/xci/xci-promote.sh b/jjb/xci/xci-promote.sh
index fb7e0e6..4e72dc8 100755 (executable)
--- a/jjb/xci/xci-promote.sh
+++ b/jjb/xci/xci-promote.sh
@@ -30,6 +30,10 @@ if [ ! -f $LOCAL_PROMOTION_METADATA_FILE ]; then
     exit 1
 fi
 
+# put additional info into the metadata file so we can use that for displaying the information
+echo "PROMOTED_BY=$BUILD_URL" >> $LOCAL_PROMOTION_METADATA_FILE
+echo "PROMOTED_ON=$(date -u '+%F_%H:%M'UTC)" >> $LOCAL_PROMOTION_METADATA_FILE
+
 # upload promotion metadata file to OPNFV artifact repo
 echo "Storing promotion metadata as $REMOTE_PROMOTION_METADATA_FILE"
 gsutil cp $LOCAL_PROMOTION_METADATA_FILE $REMOTE_PROMOTION_METADATA_FILE > /dev/null 2>&1

diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh
index 7874e67..dd953e9 100755 (executable)
--- a/jjb/xci/xci-start-new-vm.sh
+++ b/jjb/xci/xci-start-new-vm.sh
@@ -63,6 +63,9 @@ export OPNFV_RELENG_DEV_PATH=/home/devuser/releng-xci/
 export INSTALLER_TYPE=$INSTALLER_TYPE
 export GIT_BASE=$GIT_BASE
 export JENKINS_HOME=$JENKINS_HOME
+export CI_LOOP=$CI_LOOP
+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

diff --git a/releases/fraser/sdnvpn.yaml b/releases/fraser/sdnvpn.yaml
new file mode 100644 (file)
index 0000000..b0a3906
--- /dev/null
+++ b/releases/fraser/sdnvpn.yaml
@@ -0,0 +1,9 @@
+---
+project: sdnvpn
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/fraser
+    location:
+      sdnvpn: cc10bd492affb033b68d3b8f4cb1d8c9d554f995

diff --git a/releases/scripts/create_branch.py b/releases/scripts/create_branch.py
index 8de1309..362aaaf 100644 (file)
--- a/releases/scripts/create_branch.py
+++ b/releases/scripts/create_branch.py
@@ -12,7 +12,12 @@ Create Gerrit Branchs
 """
 
 import argparse
-import ConfigParser
+
+try:
+    import ConfigParser
+except ImportError:
+    import configparser as ConfigParser
+
 import logging
 import os
 import yaml
@@ -105,7 +110,7 @@ def main():
 
     try:
         auth = GerritAuth(url=gerrit_url)
-    except ValueError, err:
+    except ValueError as err:
         logging.error("%s for %s", err, gerrit_url)
         quit(1)
     restapi = GerritRestAPI(url=gerrit_url, auth=auth)