Merge "Install Curl which could be missing"

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index b260212..e3adeb6 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -921,6 +921,7 @@
     name: functest-kubernetes-trivy
     builders:
       - shell: |
+          apt-get update && apt-get install curl
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b .
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -933,6 +934,8 @@
 
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
+    triggers:
+      - timed: '@weekly'
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
@@ -981,7 +984,7 @@
 
 
 - view:
-    name: functest-kubernetes-daily
+    name: functest-kubernetes
     view-type: list
     columns:
       - status

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 5c444d4..f6041b2 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -642,6 +642,7 @@
     name: xtesting-trivy
     builders:
       - shell: |
+          apt-get update && apt-get install curl
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -654,6 +655,8 @@
 
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-trivy'
+    triggers:
+      - timed: '@daily'
     parameters:
       - xtesting-slave:
           slave: '{slave}'
@@ -684,7 +687,7 @@
 
 
 - view:
-    name: xtesting-daily
+    name: xtesting
     view-type: list
     columns:
       - status