Merge "Switch Docker Namespace from OPNFV to Anuket"

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 1dadaa5..f886c82 100644 (file)
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -424,6 +424,7 @@
 
 - job-template:
     name: 'cntt-{tag}-daily'
+    disabled: true
     project-type: multijob
     triggers:
       - timed: '@daily'
@@ -634,6 +635,7 @@
 
 - job-template:
     name: 'cntt-{tag}-gate'
+    disabled: true
     project-type: multijob
     triggers:
       - cntt-patchset-created:

diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index 2c42fc0..19f93d6 100644 (file)
--- a/jjb/functest/functest-kubernetes-ng.yaml
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -12,13 +12,13 @@
     port:
     tag:
       - v1.20:
-          buildargs:
+          build_args:
           branch: stable/leguer
           slave: lf-virtual1
           dependency: 3.12
           from: s/:leguer$/:v1.20/g
       - v1.19:
-          buildargs:
+          build_args:
           branch: stable/kali
           slave: lf-virtual1
           dependency: 3.11
@@ -27,7 +27,8 @@
           branch: stable/kali
           slave: lf-virtual1
           dependency: 3.11
-          buildargs: --build-arg K8S_TAG=1.18
+          build_args:
+            - K8S_TAG=1.18
           from: s/:kali$/:v1.18/g
 
 - functest-kubernetes-ng-jobs: &functest-kubernetes-ng-jobs
@@ -46,7 +47,7 @@
     <<: *functest-kubernetes-ng-containers
     ref_arg: '{ref_arg}'
     path: '{path}'
-    buildargs: '{buildargs}'
+    build_args: '{build_args}'
     from: '{from}'
 
 - builder:
@@ -62,8 +63,9 @@
             image={repo}:{port}/{container}:{tag}
           fi
           build_args=""
-          if [ "{buildargs}" != "None" ]; then
-            build_args="{buildargs}"
+          if [ "{build_args}" != "None" ]; then
+            for i in $(echo {build_args} | tr -d '[]' |sed "s/, / /g" ); \
+              do build_args="--build-arg $i $build_args"; done
           fi
           if [ "{ref_arg}" != "None" ]; then
             build_args="$build_args --build-arg {ref_arg}={ref}"
@@ -182,7 +184,7 @@
       - functest-kubernetes-ng-build-containers:
           <<: *functest-kubernetes-ng-build-containers
           ref: '{branch}'
-          buildargs: '{buildargs}'
+          build_args: '{build_args}'
       - functest-kubernetes-ng-push-containers:
           <<: *functest-kubernetes-ng-build-containers
           ref: '{branch}'
@@ -295,6 +297,9 @@
           projects:
             - name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-benchmarking-{tag}-build'
               <<: *functest-kubernetes-ng-jobs
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - builder:
     name: functest-kubernetes-ng-trivy
@@ -323,6 +328,9 @@
     builders:
       - functest-kubernetes-ng-trivy:
           <<: *functest-kubernetes-ng-containers
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-core-trivy'

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 48a534f..e0ecb53 100644 (file)
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -103,11 +103,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
           fi
           env=;
           if [ "{env}" != "None" ]; then
-            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
           fi
           [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
@@ -439,11 +441,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
           fi
           env=;
           if [ "{env}" != "None" ]; then
-            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
           fi
           [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
@@ -617,6 +621,9 @@
           projects:
             - name: 'functest-kubernetes-pi-{tag}-zip'
               <<: *functest-kubernetes-pi-jobs
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-pi-daily'

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 8c49729..201cb81 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -13,31 +13,31 @@
     tag:
       - latest:
           from:
-          buildargs:
+          build_args:
           branch: master
           slave: lf-virtual1-8
           dependency: 3.14
       - v1.22:
           from:
-          buildargs:
+          build_args:
           branch: stable/v1.22
           slave: lf-virtual1-7
           dependency: 3.14
       - v1.21:
           from:
-          buildargs:
+          build_args:
           branch: stable/v1.21
           slave: lf-virtual1-6
           dependency: 3.13
       - leguer:
           from:
-          buildargs:
+          build_args:
           branch: stable/leguer
           slave: lf-virtual1-5
           dependency: 3.12
       - kali:
           from:
-          buildargs:
+          build_args:
           branch: stable/kali
           slave: lf-virtual1-4
           dependency: 3.11
@@ -103,11 +103,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
           fi
           env=;
           if [ "{env}" != "None" ]; then
-            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
           fi
           [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
@@ -425,11 +427,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
           fi
           env=;
           if [ "{env}" != "None" ]; then
-            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
           fi
           [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
@@ -603,6 +607,9 @@
           projects:
             - name: 'functest-kubernetes-{tag}-zip'
               <<: *functest-kubernetes-jobs
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-daily'
@@ -627,7 +634,7 @@
     <<: *functest-kubernetes-containers
     ref_arg: '{ref_arg}'
     path: '{path}'
-    buildargs: '{buildargs}'
+    build_args: '{build_args}'
     from: '{from}'
 
 - builder:
@@ -643,8 +650,9 @@
             image={repo}:{port}/{container}:{tag}
           fi
           build_args=""
-          if [ "{buildargs}" != "None" ]; then
-            build_args="{buildargs}"
+          if [ "{build_args}" != "None" ]; then
+            for i in $(echo {build_args} | tr -d '[]' |sed "s/, / /g" ); \
+              do build_args="--build-arg $i $build_args"; done
           fi
           if [ "{ref_arg}" != "None" ]; then
             build_args="$build_args --build-arg {ref_arg}={ref}"
@@ -736,7 +744,9 @@
     builders:
       - shell: |
           set +x
-          apt-get update && DEBIAN_FRONTEND=noninteractive \
+          apt-get update && \
+          DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
+          DEBIAN_FRONTEND=noninteractive \
           apt-get install software-properties-common gpg -y
           add-apt-repository -y ppa:deadsnakes/ppa
           apt-get update && DEBIAN_FRONTEND=noninteractive \
@@ -781,7 +791,7 @@
       - functest-kubernetes-build-containers:
           <<: *functest-kubernetes-build-containers
           ref: $GERRIT_REFSPEC
-          buildargs: '{buildargs}'
+          build_args: '{build_args}'
 
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-gate
@@ -993,6 +1003,9 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-jobs
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-review'
@@ -1056,7 +1069,7 @@
       - functest-kubernetes-build-containers:
           <<: *functest-kubernetes-build-containers
           ref: '{branch}'
-          buildargs: '{buildargs}'
+          build_args: '{build_args}'
       - functest-kubernetes-push-containers:
           <<: *functest-kubernetes-build-containers
           ref: '{branch}'
@@ -1169,6 +1182,9 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-build'
               <<: *functest-kubernetes-jobs
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - builder:
     name: functest-kubernetes-trivy
@@ -1197,6 +1213,9 @@
     builders:
       - functest-kubernetes-trivy:
           <<: *functest-kubernetes-containers
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-core-trivy'

diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 52dc042..6e3c757 100644 (file)
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -14,6 +14,9 @@
       - latest:
           slave: lf-pod4-2
           DASHBOARD_URL: http://172.30.12.85
+      - xena:
+          slave: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
       - wallaby:
           slave: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
@@ -29,6 +32,9 @@
       - arm-latest:
           slave: lf-pod4-2
           DASHBOARD_URL: http://172.30.12.85
+      - xena-latest:
+          slave: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
       - arm-wallaby:
           slave: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
@@ -44,6 +50,9 @@
       - arm64-latest:
           slave: lf-pod4-2
           DASHBOARD_URL: http://172.30.12.85
+      - arm64-xena:
+          slave: laas-xena
+          DASHBOARD_URL: http://10.200.120.76
       - arm64-wallaby:
           slave: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
@@ -126,11 +135,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
           fi
           env=;
           if [ "{env}" != "None" ]; then
-            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
           fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
@@ -382,6 +393,14 @@
         test: networking-sfc
       - tag: latest
         test: patrole
+      - tag: xena
+        test: refstack_defcore
+      - tag: xena
+        test: networking-bgpvpn
+      - tag: xena
+        test: networking-sfc
+      - tag: xena
+        test: patrole
       - tag: wallaby
         test: refstack_defcore
       - tag: wallaby
@@ -432,6 +451,14 @@
         test: networking-sfc
       - tag: arm-latest
         test: patrole
+      - tag: arm-xena
+        test: refstack_defcore
+      - tag: arm-xena
+        test: networking-bgpvpn
+      - tag: arm-xena
+        test: networking-sfc
+      - tag: arm-xena
+        test: patrole
       - tag: arm-wallaby
         test: refstack_defcore
       - tag: arm-wallaby
@@ -482,6 +509,14 @@
         test: networking-sfc
       - tag: arm64-latest
         test: patrole
+      - tag: arm64-xena
+        test: refstack_defcore
+      - tag: arm64-xena
+        test: networking-bgpvpn
+      - tag: arm64-xena
+        test: networking-sfc
+      - tag: arm64-xena
+        test: patrole
       - tag: arm64-wallaby
         test: refstack_defcore
       - tag: arm64-wallaby
@@ -689,11 +724,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
           fi
           env=;
           if [ "{env}" != "None" ]; then
-            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
           fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
@@ -935,6 +972,9 @@
           projects:
             - name: 'functest-pi-{tag}-zip'
               <<: *functest-pi-jobs
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-pi-daily'

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 31a448c..a07a920 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -13,35 +13,42 @@
     tag:
       - latest:
           from:
-          buildargs:
+          build_args:
           branch: master
           slave: lf-pod4-2
           DASHBOARD_URL: http://172.30.12.85
           dependency: 3.14
+      - xena:
+          from:
+          build_args:
+          branch: stable/xena
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+          dependency: 3.14
       - wallaby:
           from:
-          buildargs:
+          build_args:
           branch: stable/wallaby
           slave: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
       - leguer:
           from:
-          buildargs:
+          build_args:
           branch: stable/leguer
           slave: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
           dependency: 3.12
       - kali:
           from:
-          buildargs:
+          build_args:
           branch: stable/kali
           slave: lf-pod4-3
           DASHBOARD_URL: http://172.30.12.88
           dependency: 3.11
       - jerma:
           from:
-          buildargs:
+          build_args:
           branch: stable/jerma
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
@@ -116,11 +123,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
           fi
           env=;
           if [ "{env}" != "None" ]; then
-            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
           fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
@@ -372,6 +381,14 @@
         test: networking-sfc
       - tag: latest
         test: patrole
+      - tag: xena
+        test: refstack_defcore
+      - tag: xena
+        test: networking-bgpvpn
+      - tag: xena
+        test: networking-sfc
+      - tag: xena
+        test: patrole
       - tag: wallaby
         test: refstack_defcore
       - tag: wallaby
@@ -579,11 +596,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
           fi
           env=;
           if [ "{env}" != "None" ]; then
-            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
           fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
@@ -825,6 +844,9 @@
           projects:
             - name: 'functest-{tag}-zip'
               <<: *functest-jobs
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-daily'
@@ -849,7 +871,7 @@
     <<: *functest-containers
     ref_arg: '{ref_arg}'
     path: '{path}'
-    buildargs: '{buildargs}'
+    build_args: '{build_args}'
     from: '{from}'
 
 - builder:
@@ -865,8 +887,9 @@
             image={repo}:{port}/{container}:{tag}
           fi
           build_args=""
-          if [ "{buildargs}" != "None" ]; then
-            build_args="{buildargs}"
+          if [ "{build_args}" != "None" ]; then
+            for i in $(echo {build_args} | tr -d '[]' |sed "s/, / /g" ); \
+              do build_args="--build-arg $i $build_args"; done
           fi
           if [ "{ref_arg}" != "None" ]; then
             build_args="$build_args --build-arg {ref_arg}={ref}"
@@ -958,7 +981,9 @@
     builders:
       - shell: |
           set +x
-          sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+          sudo apt-get update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
+          sudo DEBIAN_FRONTEND=noninteractive \
           apt-get install software-properties-common gpg -y
           sudo add-apt-repository -y ppa:deadsnakes/ppa
           sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
@@ -1003,7 +1028,7 @@
       - functest-build-containers:
           <<: *functest-build-containers
           ref: $GERRIT_REFSPEC
-          buildargs: '{buildargs}'
+          build_args: '{build_args}'
 
 - project:
     name: functest-opnfv-functest-core-{tag}-gate
@@ -1022,6 +1047,7 @@
     path: docker/tempest
     exclude:
       - {'tag': 'latest'}
+      - {'tag': 'xena'}
       - {'tag': 'wallaby'}
       - {'tag': 'leguer'}
       - {'tag': 'kali'}
@@ -1305,6 +1331,9 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-jobs
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-review'
@@ -1368,7 +1397,7 @@
       - functest-build-containers:
           <<: *functest-build-containers
           ref: '{branch}'
-          buildargs: '{buildargs}'
+          build_args: '{build_args}'
       - functest-push-containers:
           <<: *functest-build-containers
           ref: '{branch}'
@@ -1390,6 +1419,7 @@
     path: docker/tempest
     exclude:
       - {'tag': 'latest'}
+      - {'tag': 'xena'}
       - {'tag': 'wallaby'}
       - {'tag': 'leguer'}
       - {'tag': 'kali'}
@@ -1509,6 +1539,9 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-build'
               <<: *functest-jobs
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - builder:
     name: functest-trivy
@@ -1537,6 +1570,9 @@
     builders:
       - functest-trivy:
           <<: *functest-containers
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'functest-opnfv-functest-core-trivy'

diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index a935dcb..f0660de 100644 (file)
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -13,6 +13,8 @@
     tag:
       - latest:
           slave: lf-virtual1
+      - xena:
+          slave: lf-virtual1
       - wallaby:
           slave: lf-virtual1
       - leguer:
@@ -23,6 +25,8 @@
           slave: lf-virtual1
       - arm-latest:
           slave: lf-virtual1
+      - arm-xena:
+          slave: lf-virtual1
       - arm-wallaby:
           slave: lf-virtual1
       - arm-leguer:
@@ -33,6 +37,8 @@
           slave: lf-virtual1
       - arm64-latest:
           slave: lf-virtual1
+      - arm64-xena:
+          slave: lf-virtual1
       - arm64-wallaby:
           slave: lf-virtual1
       - arm64-leguer:
@@ -89,11 +95,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
           fi
           env=;
           if [ "{env}" != "None" ]; then
-            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
           fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
@@ -259,11 +267,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
           fi
           env=;
           if [ "{env}" != "None" ]; then
-            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
           fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
@@ -368,6 +378,9 @@
           projects:
             - name: 'xtesting-pi-{tag}-zip'
               <<: *xtesting-pi-jobs
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'xtesting-pi-daily'

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index ec613a6..13e60c4 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -13,31 +13,37 @@
     tag:
       - latest:
           from:
-          buildargs:
+          build_args:
           branch: master
           slave: lf-virtual1
           dependency: 3.14
+      - xena:
+          from:
+          build_args:
+          branch: stable/xena
+          slave: lf-virtual1
+          dependency: 3.14
       - wallaby:
           from:
-          buildargs:
+          build_args:
           branch: stable/wallaby
           slave: lf-virtual1
           dependency: 3.13
       - leguer:
           from:
-          buildargs:
+          build_args:
           branch: stable/leguer
           slave: lf-virtual1
           dependency: 3.12
       - kali:
           from:
-          buildargs:
+          build_args:
           branch: stable/kali
           slave: lf-virtual1
           dependency: 3.11
       - jerma:
           from:
-          buildargs:
+          build_args:
           branch: stable/jerma
           slave: lf-virtual1
           dependency: 3.10
@@ -89,11 +95,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
           fi
           env=;
           if [ "{env}" != "None" ]; then
-            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
           fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
@@ -247,11 +255,13 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
           fi
           env=;
           if [ "{env}" != "None" ]; then
-            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
           fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
@@ -356,6 +366,9 @@
           projects:
             - name: 'xtesting-{tag}-zip'
               <<: *xtesting-jobs
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'xtesting-daily'
@@ -380,7 +393,7 @@
     <<: *xtesting-containers
     ref_arg: '{ref_arg}'
     path: '{path}'
-    buildargs: '{buildargs}'
+    build_args: '{build_args}'
     from: '{from}'
 
 - builder:
@@ -396,8 +409,9 @@
             image={repo}:{port}/{container}:{tag}
           fi
           build_args=""
-          if [ "{buildargs}" != "None" ]; then
-            build_args="{buildargs}"
+          if [ "{build_args}" != "None" ]; then
+            for i in $(echo {build_args} | tr -d '[]' |sed "s/, / /g" ); \
+              do build_args="--build-arg $i $build_args"; done
           fi
           if [ "{ref_arg}" != "None" ]; then
             build_args="$build_args --build-arg {ref_arg}={ref}"
@@ -489,7 +503,9 @@
     builders:
       - shell: |
           set +x
-          sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+          sudo apt-get update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
+          sudo DEBIAN_FRONTEND=noninteractive \
           apt-get install software-properties-common gpg -y
           sudo add-apt-repository -y ppa:deadsnakes/ppa
           sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
@@ -534,7 +550,7 @@
       - xtesting-build-containers:
           <<: *xtesting-build-containers
           ref: $GERRIT_REFSPEC
-          buildargs: '{buildargs}'
+          build_args: '{build_args}'
 
 - project:
     name: xtesting-opnfv-xtesting-{tag}-gate
@@ -640,6 +656,9 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
               <<: *xtesting-jobs
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'xtesting-review'
@@ -703,7 +722,7 @@
       - xtesting-build-containers:
           <<: *xtesting-build-containers
           ref: '{branch}'
-          buildargs: '{buildargs}'
+          build_args: '{build_args}'
       - xtesting-push-containers:
           <<: *xtesting-build-containers
           ref: '{branch}'
@@ -766,6 +785,9 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-mts-{tag}-build'
               <<: *xtesting-jobs
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - builder:
     name: xtesting-trivy
@@ -794,6 +816,9 @@
     builders:
       - xtesting-trivy:
           <<: *xtesting-containers
+    publishers:
+      - email:
+          recipients: cedric.ollivier@orange.com
 
 - project:
     name: 'xtesting-opnfv-xtesting-trivy'

diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index 42dcf31..32cc5ea 100644 (file)
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -8,8 +8,11 @@
     project-pattern: 'opnfvdocs'
     jobs:
       - '{project-name}-rtd-jobs'
+      - 'gerrit-tox-verify':
+          python-version: python3
+          tox-envs: "docs"
+          build-days-to-keep: 7
       - 'docs-merge-rtd-{stream}'
-      - 'docs-verify-rtd-{stream}'
 
     stream:
       - master:
@@ -43,46 +46,3 @@
 
     builders:
       - 'remove-old-docs-from-opnfv-artifacts'
-
-- job-template:
-    name: 'docs-verify-rtd-{stream}'
-
-    project-type: freestyle
-
-    parameters:
-      - label:
-          name: SLAVE_LABEL
-          default: 'lf-build5'
-          description: 'Slave label on Jenkins'
-          all-nodes: false
-          node-eligibility: 'ignore-offline'
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/opnfvdocs
-          description: 'Git URL to use on this Jenkins Slave'
-
-    scm:
-      - git-scm-with-submodules:
-          branch: '{branch}'
-
-    triggers:
-      - gerrit-trigger-patchset-created:
-          server: 'gerrit.opnfv.org'
-          project: 'opnfvdocs'
-          branch: '{branch}'
-          files: 'docs/**'
-
-    builders:
-      - shell: |
-          sudo -H pip install virtualenv
-          virtualenv $WORKSPACE/venv
-          . $WORKSPACE/venv/bin/activate
-          pip install --upgrade pip
-          pip freeze
-          pip install tox
-          sed -i s,\-b\ html,\-b\ singlehtml,g tox.ini
-          tox -edocs
-      - 'upload-review-docs'

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 18ccea9..12983dd 100644 (file)
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -38,6 +38,9 @@
       receivers: >
           luc.provoost@intel.com
           yury.kylulin@intel.com
+    vineperf-receivers: &vineperf-receivers
+      receivers: >
+          sridhar.rao@spirent.com
     other-receivers: &other-receivers
       receivers: ''
 
@@ -180,6 +183,36 @@
           dockerdir: 'VNFs/DPPD-PROX/helper-scripts/rapid'
           <<: *master
           <<: *samplevnf-receivers
+      - 'vineperf':
+          project: 'vineperf'
+          dockerdir: 'tools/docker/vineperf'
+          <<: *master
+          <<: *vineperf-receivers
+      - 'vineperf-prox':
+          project: 'vineperf'
+          dockerdir: 'tools/docker/test-containers/trafficgen-pods/prox'
+          <<: *master
+          <<: *vineperf-receivers
+      - 'vineperf-trex':
+          project: 'vineperf'
+          dockerdir: 'tools/docker/test-containers/trafficgen-pods/trex'
+          <<: *master
+          <<: *vineperf-receivers
+      - 'vineperf-pktgen':
+          project: 'vineperf'
+          dockerdir: 'tools/docker/test-containers/trafficgen-pods/pktgen'
+          <<: *master
+          <<: *vineperf-receivers
+      - 'vineperf-l2l3fwd':
+          project: 'vineperf'
+          dockerdir: 'tools/docker/test-containers/dpdk-forwarding-pods/l2l3fwd'
+          <<: *master
+          <<: *vineperf-receivers
+      - 'vineperf-vpp':
+          project: 'vineperf'
+          dockerdir: 'tools/docker/test-containers/dpdk-forwarding-pods/vpp'
+          <<: *master
+          <<: *vineperf-receivers
 
       # projects with jobs for hunter
       - 'dovetail':

diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml
index 22061c8..188810a 100644 (file)
--- a/jjb/releng/releng-release-jobs.yaml
+++ b/jjb/releng/releng-release-jobs.yaml
@@ -23,6 +23,7 @@
       - v1.21
       - wallaby
       - v1.22
+      - xena
 
     jobs:
       - 'releng-release-{stream}-verify'

diff --git a/jjb/vineperf/vineperf-rtd-jobs.yaml b/jjb/vineperf/vineperf-rtd-jobs.yaml
new file mode 100644 (file)
index 0000000..5f9c852
--- /dev/null
+++ b/jjb/vineperf/vineperf-rtd-jobs.yaml
@@ -0,0 +1,29 @@
+---
+- project:
+    name: vineperf-rtd
+    project: vineperf
+    project-name: vineperf
+
+    gerrit-skip-vote: true
+    project-pattern: 'vineperf'
+    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-vineperf/47398/'
+    rtd-token: '47bbe5675e6cc5a6207fcc9b4db8dac03c27d9de'
+
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - jerma: &jerma
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - hunter:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
+    jobs:
+      - '{project-name}-rtd-jobs'

diff --git a/jjb/vineperf/vineperf-views.yaml b/jjb/vineperf/vineperf-views.yaml
new file mode 100644 (file)
index 0000000..1f5348f
--- /dev/null
+++ b/jjb/vineperf/vineperf-views.yaml
@@ -0,0 +1,6 @@
+---
+- project:
+    name: vineperf-view
+    views:
+      - project-view
+    project-name: vineperf

diff --git a/jjb/vineperf/vineperf.yaml b/jjb/vineperf/vineperf.yaml
new file mode 100644 (file)
index 0000000..74ea0e7
--- /dev/null
+++ b/jjb/vineperf/vineperf.yaml
@@ -0,0 +1,207 @@
+---
+- project:
+
+    name: vineperf
+
+    project: '{name}'
+
+    jobs:
+      - 'vineperf-verify-{stream}'
+      - 'vineperf-merge-{stream}'
+      - 'vineperf-daily-{stream}'
+
+    stream:
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+      - jerma: &jerma
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - hunter:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - fraser:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+
+- job-template:
+
+    name: 'vineperf-daily-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'vineperf-verify-.*'
+            - 'vineperf-merge-.*'
+            - 'vineperf-daily-.*'
+          blocking-level: 'NODE'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'intel-pod12-defaults'
+
+    scm:
+      - git-scm
+
+    triggers:
+      - pollscm:
+          cron: '@midnight'
+
+    builders:
+      - shell: |
+          pwd
+          cd src
+          make clobber
+          make MORE_MAKE_FLAGS="-j 10"
+          cd ../ci
+          scl enable rh-python34 "source ~/vsperfenv/bin/activate ; ./build-vsperf.sh daily"
+
+- job-template:
+    name: 'vineperf-verify-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    project-type: freestyle
+
+    concurrent: true
+
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'vineperf-verify-.*'
+            - 'vineperf-merge-.*'
+            - 'vineperf-daily-.*'
+          blocking-level: 'NODE'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - intel-pod12
+          default-slaves:
+            - intel-pod12
+
+    scm:
+      - git-scm-gerrit
+
+    triggers:
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'true'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'docs/**'
+
+    builders:
+      - shell: |
+          pwd
+          cd src
+          make clobber
+          make MORE_MAKE_FLAGS="-j 5"
+          cd ../ci
+          ./build-vsperf.sh verify
+
+- job-template:
+    name: 'vineperf-merge-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    project-type: freestyle
+
+    concurrent: true
+
+    properties:
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'vineperf-verify-.*'
+            - 'vineperf-merge-.*'
+            - 'vineperf-daily-.*'
+          blocking-level: 'NODE'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - intel-pod12
+          default-slaves:
+            - intel-pod12
+
+    scm:
+      - git-scm
+
+    triggers:
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'true'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'docs/**'
+
+    builders:
+      - shell: |
+          pwd
+          cd src
+          make clobber
+          make MORE_MAKE_FLAGS="-j 5"
+          cd ../ci
+          ./build-vsperf.sh merge

diff --git a/releases/xena/functest.yaml b/releases/xena/functest.yaml
new file mode 100644 (file)
index 0000000..cdd9904
--- /dev/null
+++ b/releases/xena/functest.yaml
@@ -0,0 +1,12 @@
+---
+project: functest
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/xena
+    location:
+      functest: 1d976335e832e4b48fb7bd2cda3665c28dfabe86
+  - name: stable/xena
+    location:
+      functest-xtesting: f32ab02c42a775e57ba34153d2d401bee34e88b8