Merge "Increase timout for apt locks"

[releng.git] / jjb / functest / functest-kubernetes-ng.yaml

diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index c447d53..9a868d3 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,38 +27,9 @@
           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
-      - v1.17:
-          buildargs:
-          branch: stable/jerma
-          slave: lf-virtual1
-          dependency: 3.10
-          from: s/:jerma$/:v1.17/g
-      - v1.16:
-          branch: stable/jerma
-          slave: lf-virtual1
-          dependency: 3.10
-          buildargs: --build-arg K8S_TAG=1.16
-          from: s/:jerma$/:v1.16/g
-      - v1.15:
-          buildargs:
-          branch: stable/iruya
-          slave: lf-virtual1
-          dependency: 3.9
-          from: s/:iruya$/:v1.15/g
-      - v1.14:
-          branch: stable/iruya
-          slave: lf-virtual1
-          dependency: 3.9
-          buildargs: --build-arg K8S_TAG=1.14
-          from: s/:iruya$/:v1.14/g
-      - v1.13:
-          buildargs:
-          branch: stable/hunter
-          slave: lf-virtual1
-          dependency: 3.9
-          from: s/:hunter$/:v1.13/g
 
 - functest-kubernetes-ng-jobs: &functest-kubernetes-ng-jobs
     name: 'functest-kubernetes-ng-jobs'
@@ -71,13 +42,12 @@
           name: slave
           default: '{slave}'
 
-
 - functest-kubernetes-ng-build-containers: &functest-kubernetes-ng-build-containers
     name: 'functest-kubernetes-ng-build-containers'
     <<: *functest-kubernetes-ng-containers
     ref_arg: '{ref_arg}'
     path: '{path}'
-    buildargs: '{buildargs}'
+    build_args: '{build_args}'
     from: '{from}'
 
 - builder:
@@ -93,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}"
@@ -130,10 +101,10 @@
           set +x
           if [ "_" = "_" ]; then
             image=alpine:{dependency}
-          elif [ "_" = "None" ]; then
+          elif [ "None" = "None" ]; then
             image=_/alpine:{dependency}
           else
-            image=_:/alpine{dependency}
+            image=_:/alpine:{dependency}
           fi
           sudo docker pull $image || true
 
@@ -144,10 +115,10 @@
           set +x
           if [ "_" = "_" ]; then
             image=alpine:{dependency}
-          elif [ "_" = "None" ]; then
+          elif [ "" = "None" ]; then
             image=_/alpine:{dependency}
           else
-            image=_:/alpine{dependency}
+            image=_:/alpine:{dependency}
           fi
           sudo docker rmi $image || true
 
@@ -181,7 +152,6 @@
     jobs:
       - 'functest-kubernetes-ng-{repo}-{tag}-dep-rmi'
 
-
 - builder:
     name: functest-kubernetes-ng-push-containers
     builders:
@@ -214,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}'
@@ -273,7 +243,6 @@
     jobs:
       - 'functest-kubernetes-ng-{repo}-{container}-{tag}-build'
 
-
 - job-template:
     name: 'functest-kubernetes-ng-{tag}-docker'
     project-type: multijob
@@ -285,12 +254,14 @@
     parameters:
       - functest-kubernetes-ng-slave:
           slave: '{slave}'
+    # PyYAML and yamllint differ here
+    # see https://github.com/yaml/pyyaml/issues/234
+    # yamllint disable rule:indentation
     properties:
       - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-ng-{tag}-(daily|docker|review)$'
+          - ^functest-kubernetes-ng-{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove dependency
@@ -326,12 +297,18 @@
           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
     builders:
       - shell: |
-          sudo apt-get update && sudo apt-get install curl -y
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl -y
+
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -352,6 +329,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'