Merge "[Functest] Support functest-suite with Alpine containers"

diff --git a/jjb/ci_gate_security/anteater-security-audit.sh b/jjb/ci_gate_security/anteater-security-audit.sh
index 35f9354..8a170b0 100644 (file)
--- a/jjb/ci_gate_security/anteater-security-audit.sh
+++ b/jjb/ci_gate_security/anteater-security-audit.sh
@@ -2,6 +2,8 @@
 cd $WORKSPACE
 REPORTDIR='.reports'
 mkdir -p $REPORTDIR
+# Ensure any user can read the reports directory
+chmod 777 $REPORTDIR
 echo "Generating patchset file to list changed files"
 git diff HEAD^1 --name-only | sed "s#^#/home/opnfv/anteater/$PROJECT/#" > $WORKSPACE/patchset
 echo "Changed files are"

diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yml b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
index 3317953..e09339a 100644 (file)
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
@@ -50,7 +50,7 @@
     parameters:
       - label:
           name: SLAVE_LABEL
-          default: 'ericsson-build3'
+          default: 'opnfv-build'
           description: 'Slave label on Jenkins'
       - project-parameter:
           project: $GERRIT_PROJECT

diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index ad497e9..2055da9 100644 (file)
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -8,19 +8,19 @@
       - master:
           branch: '{stream}'
           gs-pathname: ''
-          disabled: false
       - euphrates:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
-          disabled: true
     #####################################
     # patch verification phases
     #####################################
     phase:
       - 'build':
           slave-label: 'opnfv-build-ubuntu'
+          disabled: false
       - 'test':
           slave-label: 'intel-pod10'
+          disabled: true
     #####################################
     # patch verification phases
     #####################################

diff --git a/utils/test/reporting/docker/nginx.conf b/utils/test/reporting/docker/nginx.conf
index 95baf0e..66bd7e4 100644 (file)
--- a/utils/test/reporting/docker/nginx.conf
+++ b/utils/test/reporting/docker/nginx.conf
@@ -15,7 +15,7 @@ server {
     }
 
     location /api/ {
-        http_pass http://backends/;
+        proxy_pass http://backends/;
     }
 
     location /display/ {