Merge "Add availability yaml for Fraser release"

diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh
index 49d7163..9017354 100755 (executable)
--- a/jjb/functest/functest-k8.sh
+++ b/jjb/functest/functest-k8.sh
@@ -12,7 +12,6 @@ sudo rm -rf $rc_file
 
 if [[ ${INSTALLER_TYPE} == 'compass' ]]; then
     admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config"
-    echo "export KUBECONFIG=/root/.kube/config" >> $rc_file
     echo "export KUBERNETES_PROVIDER=local" >> $rc_file
     KUBE_MASTER_URL=$(cat ${HOME}/admin.conf|grep server| awk '{print $2}')
     echo "export KUBE_MASTER_URL=$KUBE_MASTER_URL" >> $rc_file

diff --git a/jjb/global/basic-jobs.yml b/jjb/global/basic-jobs.yml
index e55f068..a8b9cff 100644 (file)
--- a/jjb/global/basic-jobs.yml
+++ b/jjb/global/basic-jobs.yml
@@ -13,7 +13,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/jjb/releng/releng-release-create-branch.sh b/jjb/releng/releng-release-create-branch.sh
index ec83653..8375560 100644 (file)
--- a/jjb/releng/releng-release-create-branch.sh
+++ b/jjb/releng/releng-release-create-branch.sh
@@ -10,8 +10,8 @@
 set -xe
 
 # Configure the git user/email as we'll be pushing up changes
-git config user.name "jenkins-ci"
-git config user.email "jenkins-opnfv-ci@opnfv.org"
+git config --global user.name "jenkins-ci"
+git config --global user.email "jenkins-opnfv-ci@opnfv.org"
 
 # Ensure we are able to generate Commit-IDs for new patchsets
 curl -kLo .git/hooks/commit-msg https://gerrit.opnfv.org/gerrit/tools/hooks/commit-msg

diff --git a/jjb/releng/releng-release-jobs.yml b/jjb/releng/releng-release-jobs.yml
index b581b16..e31320b 100644 (file)
--- a/jjb/releng/releng-release-jobs.yml
+++ b/jjb/releng/releng-release-jobs.yml
@@ -90,7 +90,7 @@
       - gerrit-trigger-change-merged:
           project: '{project}'
           branch: 'master'
-          files: 'releases/**'
+          files: 'releases/{stream}/*'
 
     builders:
       - create-virtualenv

diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index d6442a9..e4e5705 100644 (file)
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -87,6 +87,8 @@
                   pattern: 'prototypes/**'
                 - compare-type: ANT
                   pattern: 'upstream/**'
+                - compare-type: ANT
+                  pattern: 'INFO.yaml'
             - project-compare-type: 'REG_EXP'
               project-pattern: 'sfc|sdnvpn'
               branches:

diff --git a/jjb/xci/xci-promote.sh b/jjb/xci/xci-promote.sh
index 07fff80..4e72dc8 100755 (executable)
--- a/jjb/xci/xci-promote.sh
+++ b/jjb/xci/xci-promote.sh
@@ -32,7 +32,7 @@ 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 '+%F_%H:%M')" >> $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"

diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh
index 2e34363..aa98e07 100755 (executable)
--- a/jjb/xci/xci-run-functest.sh
+++ b/jjb/xci/xci-run-functest.sh
@@ -49,7 +49,10 @@ if ! sed -n "/^- scenario: $DEPLOY_SCENARIO$/,/^$/p" $OPNFV_SCENARIO_REQUIREMENT
     exit 0
 fi
 
-ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "cd releng-xci/xci && PATH=/home/devuser/.local/bin:$PATH ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml"
+# set XCI_VENV for ansible
+export XCI_VENV=/home/devuser/releng-xci/venv
+
+ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; cd releng-xci/xci && ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml"
 echo "Running functest"
 ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/run-functest.sh"
 echo "Functest log"

diff --git a/releases/fraser/compass4nfv.yaml b/releases/fraser/compass4nfv.yaml
new file mode 100644 (file)
index 0000000..5b5c777
--- /dev/null
+++ b/releases/fraser/compass4nfv.yaml
@@ -0,0 +1,12 @@
+---
+project: compass4nfv
+project-type: installer
+release-model: stable
+
+branches:
+  - name: stable/fraser
+    location:
+      compass4nfv: 9c5ae544e3f1adbc5bb0df1fc7388012bdf642fa
+  - name: stable/fraser
+    location:
+      compass-containers: 15a7cbc925bed896c3c09a5635454c33dbffbadc

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

diff --git a/releases/scripts/create_branch.py b/releases/scripts/create_branch.py
index 362aaaf..fa3c92d 100644 (file)
--- a/releases/scripts/create_branch.py
+++ b/releases/scripts/create_branch.py
@@ -65,8 +65,9 @@ def create_branch(api, arguments):
         logger.debug("Commit exists: %(commit)s", arguments)
     except RequestException as err:
         if hasattr(err, 'response') and err.response.status_code in [404]:
-            logger.warn("Commit %(commit)s for %(project)s:%(branch)s does"
+            logger.warn("Commit %(commit)s for %(project)s does"
                         " not exist. Not creating branch.", arguments)
+            logger.warn(err)
         else:
             logger.error("Error: %s", str(err))
         # Skip trying to create the branch
@@ -82,6 +83,7 @@ def create_branch(api, arguments):
         if hasattr(err, 'response') and err.response.status_code in [412, 409]:
             logger.info("Branch %(branch)s already created for %(project)s",
                         arguments)
+            logger.info(err)
         else:
             logger.error("Error: %s", str(err))
 

diff --git a/releases/scripts/defaults.cfg b/releases/scripts/defaults.cfg
index 47bf091..6bc8765 100644 (file)
--- a/releases/scripts/defaults.cfg
+++ b/releases/scripts/defaults.cfg
@@ -1,2 +1,2 @@
 [gerrit]
-url=https://gerrit.opnfv.org/
+url=https://gerrit.opnfv.org/gerrit/