From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Thu, 13 May 2021 00:05:33 +0000 (+0000)
Subject: Merge "Add Workspace Permission Fix Wrapper for SampleVNF"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=81ef6740c51f2446a4afa88b7c85faa844d7b807;hp=02a3ac5d0e1c3ebbea898b6749515dbeffc582ea;p=releng.git

Merge "Add Workspace Permission Fix Wrapper for SampleVNF"
---

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 81ab55946..36748bb38 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -293,6 +293,7 @@
     container: 'functest-kubernetes-benchmarking'
     test:
       - xrally_kubernetes_full
+      - netperf
     privileged: 'false'
     network: bridge
     jobs:
@@ -466,6 +467,8 @@
           projects:
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-netperf-run'
+              <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-cnf:{tag}
           projects:
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index f35ab8e36..f463a7844 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -15,7 +15,7 @@
           from:
           buildargs:
           branch: master
-          slave: lf-virtual1-6
+          slave: lf-virtual1-7
           dependency: 3.13
       - v1.21:
           from:
@@ -288,6 +288,7 @@
     container: 'functest-kubernetes-benchmarking'
     test:
       - xrally_kubernetes_full
+      - netperf
     privileged: 'false'
     network: bridge
     jobs:
@@ -461,6 +462,8 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-netperf-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
@@ -855,6 +858,8 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-netperf-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
diff --git a/jjb/samplevnf/samplevnf.yaml b/jjb/samplevnf/samplevnf.yaml
index 954901745..e4413c028 100644
--- a/jjb/samplevnf/samplevnf.yaml
+++ b/jjb/samplevnf/samplevnf.yaml
@@ -59,7 +59,7 @@
     builders:
       - shell: |
           cd $WORKSPACE/rapidvm/dib
-          bash build-image.sh -g {gs-pathname} -i {tag}
+          bash build-image.sh -g {gs-pathname} -i {tag} -w $WORKSPACE
 
 - job-template:
     name: 'rapid-prox-verify-{stream}'
@@ -109,4 +109,4 @@
           sudo pip install tox-pip-version
           cd $WORKSPACE && tox -e docs
           cd $WORKSPACE/rapidvm/dib
-          bash build-image.sh -g {gs-pathname} -i {tag} -v
+          bash build-image.sh -g {gs-pathname} -i {tag} -v -w $WORKSPACE