Merge "Fix Functest return values"

diff --git a/jjb/container4nfv/container4nfv-arm64.yaml b/jjb/container4nfv/container4nfv-arm64.yaml
index 069a5d2..9ebaea9 100644 (file)
--- a/jjb/container4nfv/container4nfv-arm64.yaml
+++ b/jjb/container4nfv/container4nfv-arm64.yaml
@@ -33,7 +33,7 @@
 
     wrappers:
       - timeout:
-          timeout: 210
+          timeout: 300
           fail: true
 
     scm:
@@ -63,6 +63,8 @@
               unstable-threshold: 'Failure'
           - project: functest-compass-arm-virtual-daily-master
             current-parameters: false
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
             same-node: true
             block: true
             block-thresholds:

diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml
index 8055fdb..fe24ed5 100644 (file)
--- a/jjb/global/releng-macros.yaml
+++ b/jjb/global/releng-macros.yaml
@@ -420,7 +420,7 @@
       - shell: |
           #!/bin/bash
           # Install python package
-          sudo pip install "flake8==2.6.2"
+          sudo -H pip install "flake8==2.6.2"
 
           echo "Checking python code..."
           for f in $(egrep '\.py$' modified_files)
@@ -438,7 +438,7 @@
       - shell: |
           #!/bin/bash
           # sudo Install python packages
-          sudo pip install "yamllint==1.8.2"
+          sudo -H pip install "yamllint==1.8.2"
 
           echo "Checking yaml file..."
           for f in $(egrep '\.ya?ml$' modified_files)

diff --git a/jjb/openci/openci-opnfv-daily-jobs.yaml b/jjb/openci/openci-opnfv-daily-jobs.yaml
index 7f48fcc..ad2bce0 100644 (file)
--- a/jjb/openci/openci-opnfv-daily-jobs.yaml
+++ b/jjb/openci/openci-opnfv-daily-jobs.yaml
@@ -57,7 +57,7 @@
     triggers:
       - jms-messaging:
           provider-name: openci.activemq
-          selector: JMSType = 'ArtifactPublishedEvent' and JMSOrigin = 'ODL'
+          selector: JMSType = 'ArtifactPublishedEvent' and JMSOrigin = '{origin}'
 
     builders:
       - shell: |

diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index ece8569..fc99bd3 100644 (file)
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -88,7 +88,7 @@
               git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
           fi
       - shell: |
-          sudo pip install virtualenv
+          sudo -H pip install virtualenv
           virtualenv $WORKSPACE/venv
           . $WORKSPACE/venv/bin/activate
           pip install --upgrade pip

diff --git a/jjb/releng/releng-release-create-venv.sh b/jjb/releng/releng-release-create-venv.sh
index 0d5635b..de585fd 100644 (file)
--- a/jjb/releng/releng-release-create-venv.sh
+++ b/jjb/releng/releng-release-create-venv.sh
@@ -10,7 +10,7 @@
 set -e -o pipefail
 echo "---> Create virtualenv"
 
-sudo pip install virtualenv
+sudo -H pip install virtualenv
 virtualenv $WORKSPACE/venv
 # shellcheck source=$WORKSPACE/venv/bin/activate disable=SC1091
 source $WORKSPACE/venv/bin/activate

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

diff --git a/releases/gambia/compass4nfv.yaml b/releases/gambia/compass4nfv.yaml
new file mode 100644 (file)
index 0000000..e052388
--- /dev/null
+++ b/releases/gambia/compass4nfv.yaml
@@ -0,0 +1,12 @@
+---
+project: compass4nfv
+project-type: installer
+release-model: stable
+
+branches:
+  - name: stable/gambia
+    location:
+      compass4nfv: 33f94b43639dbe37b7e8e2b5eeb4c65064207c6b
+  - name: stable/gambia
+    location:
+      compass-containers: 20e229822b31b03e1120c3e5efd4ba131261617e

diff --git a/releases/gambia/doctor.yaml b/releases/gambia/doctor.yaml
new file mode 100644 (file)
index 0000000..3294fec
--- /dev/null
+++ b/releases/gambia/doctor.yaml
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 Nokia Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: doctor
+project-type: feature
+release-model: stable
+
+releases:
+  - version: opnfv-7.0.0
+    location:
+      doctor: 3ddc2392b0ed364eede49ff006d64df3ea456350
+
+branches:
+  - name: stable/gambia
+    location:
+      doctor: 3ddc2392b0ed364eede49ff006d64df3ea456350

diff --git a/releases/gambia/ipv6.yaml b/releases/gambia/ipv6.yaml
new file mode 100644 (file)
index 0000000..a566e54
--- /dev/null
+++ b/releases/gambia/ipv6.yaml
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: ipv6
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/gambia
+    location:
+      ipv6: e36f753cf6e9ab0c02a400b6bac5c79b48268d44

diff --git a/releases/gambia/samplevnf.yaml b/releases/gambia/samplevnf.yaml
new file mode 100644 (file)
index 0000000..1727730
--- /dev/null
+++ b/releases/gambia/samplevnf.yaml
@@ -0,0 +1,9 @@
+---
+project: samplevnf
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/gambia
+    location:
+      samplevnf: 4d59d3530d1c41734f15423142e64eb9c929c717

diff --git a/releases/gambia/sfc.yaml b/releases/gambia/sfc.yaml
new file mode 100644 (file)
index 0000000..14152d3
--- /dev/null
+++ b/releases/gambia/sfc.yaml
@@ -0,0 +1,9 @@
+---
+project: sfc
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/gambia
+    location:
+      sfc: 77bdb6a79a506f91959070dc8ff28949f2dff825