Merge "Add Gitlab Templates for Docker, RTD, and GS"

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 81ab559..36748bb 100644 (file)
--- 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 f35ab8e..f463a78 100644 (file)
--- 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/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index f045f9e..a52f28f 100644 (file)
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -12,8 +12,11 @@
     port:
     tag:
       - latest:
-          slave: lf-virtual9
-          DASHBOARD_URL: http://172.30.13.94
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+      - wallaby:
+          slave: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
       - leguer:
           slave: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
@@ -24,8 +27,11 @@
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
       - arm-latest:
-          slave: lf-virtual9
-          DASHBOARD_URL: http://172.30.13.94
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+      - arm-wallaby:
+          slave: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
       - arm-leguer:
           slave: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
@@ -36,8 +42,11 @@
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
       - arm64-latest:
-          slave: lf-virtual9
-          DASHBOARD_URL: http://172.30.13.94
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+      - arm64-wallaby:
+          slave: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
       - arm64-leguer:
           slave: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
@@ -329,6 +338,10 @@
       - {'tag': 'latest', 'test': 'networking-bgpvpn'}
       - {'tag': 'latest', 'test': 'networking-sfc'}
       - {'tag': 'latest', 'test': 'patrole'}
+      - {'tag': 'wallaby', 'test': 'refstack_defcore'}
+      - {'tag': 'wallaby', 'test': 'networking-bgpvpn'}
+      - {'tag': 'wallaby', 'test': 'networking-sfc'}
+      - {'tag': 'wallaby', 'test': 'patrole'}
       - {'tag': 'leguer', 'test': 'refstack_defcore'}
       - {'tag': 'leguer', 'test': 'networking-bgpvpn'}
       - {'tag': 'leguer', 'test': 'networking-sfc'}
@@ -350,6 +363,10 @@
       - {'tag': 'arm-latest', 'test': 'networking-bgpvpn'}
       - {'tag': 'arm-latest', 'test': 'networking-sfc'}
       - {'tag': 'arm-latest', 'test': 'patrole'}
+      - {'tag': 'arm-wallaby', 'test': 'refstack_defcore'}
+      - {'tag': 'arm-wallaby', 'test': 'networking-bgpvpn'}
+      - {'tag': 'arm-wallaby', 'test': 'networking-sfc'}
+      - {'tag': 'arm-wallaby', 'test': 'patrole'}
       - {'tag': 'arm-leguer', 'test': 'refstack_defcore'}
       - {'tag': 'arm-leguer', 'test': 'networking-bgpvpn'}
       - {'tag': 'arm-leguer', 'test': 'networking-sfc'}
@@ -371,6 +388,10 @@
       - {'tag': 'arm64-latest', 'test': 'networking-bgpvpn'}
       - {'tag': 'arm64-latest', 'test': 'networking-sfc'}
       - {'tag': 'arm64-latest', 'test': 'patrole'}
+      - {'tag': 'arm64-wallaby', 'test': 'refstack_defcore'}
+      - {'tag': 'arm64-wallaby', 'test': 'networking-bgpvpn'}
+      - {'tag': 'arm64-wallaby', 'test': 'networking-sfc'}
+      - {'tag': 'arm64-wallaby', 'test': 'patrole'}
       - {'tag': 'arm64-leguer', 'test': 'refstack_defcore'}
       - {'tag': 'arm64-leguer', 'test': 'networking-bgpvpn'}
       - {'tag': 'arm64-leguer', 'test': 'networking-sfc'}

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 6c2add0..2ae0995 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -15,8 +15,15 @@
           from:
           buildargs:
           branch: master
-          slave: lf-virtual9
-          DASHBOARD_URL: http://172.30.13.94
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+          dependency: 3.13
+      - wallaby:
+          from:
+          buildargs:
+          branch: stable/wallaby
+          slave: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
       - leguer:
           from:
@@ -321,6 +328,10 @@
       - {'tag': 'latest', 'test': 'networking-bgpvpn'}
       - {'tag': 'latest', 'test': 'networking-sfc'}
       - {'tag': 'latest', 'test': 'patrole'}
+      - {'tag': 'wallaby', 'test': 'refstack_defcore'}
+      - {'tag': 'wallaby', 'test': 'networking-bgpvpn'}
+      - {'tag': 'wallaby', 'test': 'networking-sfc'}
+      - {'tag': 'wallaby', 'test': 'patrole'}
       - {'tag': 'leguer', 'test': 'refstack_defcore'}
       - {'tag': 'leguer', 'test': 'networking-bgpvpn'}
       - {'tag': 'leguer', 'test': 'networking-sfc'}
@@ -833,6 +844,7 @@
     path: docker/tempest
     exclude:
       - {'tag': 'latest'}
+      - {'tag': 'wallaby'}
       - {'tag': 'leguer'}
       - {'tag': 'kali'}
       - {'tag': 'jerma'}
@@ -1199,6 +1211,7 @@
     path: docker/tempest
     exclude:
       - {'tag': 'latest'}
+      - {'tag': 'wallaby'}
       - {'tag': 'leguer'}
       - {'tag': 'kali'}
       - {'tag': 'jerma'}

diff --git a/jjb/samplevnf/samplevnf.yaml b/jjb/samplevnf/samplevnf.yaml
index 2856805..e4413c0 100644 (file)
--- a/jjb/samplevnf/samplevnf.yaml
+++ b/jjb/samplevnf/samplevnf.yaml
@@ -25,6 +25,10 @@
 
     disabled: '{obj:disabled}'
 
+    wrappers:
+      - ssh-agent-wrapper
+      - fix-workspace-permissions
+
     parameters:
       - project-parameter:
           project: '{project}'
@@ -55,13 +59,17 @@
     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}'
 
     disabled: '{obj:disabled}'
 
+    wrappers:
+      - ssh-agent-wrapper
+      - fix-workspace-permissions
+
     parameters:
       - project-parameter:
           project: '{project}'
@@ -101,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