summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2021-02-11 09:18:39 +0000
committerGerrit Code Review <gerrit@opnfv.org>2021-02-11 09:18:39 +0000
commit0aa470d1a0c7c32f60cadd0e781470073166c6a0 (patch)
tree45611aba60b3996821fb22a1647b6950b09d294a /jjb
parent86668093459c1de997b8f16ea27e9d9ba9ba1bef (diff)
parent910c6bd59b55797b7f2400efb8198bab86b922ec (diff)
Merge "Install Curl which could be missing"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest-kubernetes.yaml5
-rw-r--r--jjb/functest/xtesting.yaml5
2 files changed, 8 insertions, 2 deletions
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index b26021267..e3adeb6d1 100644
--- 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 5c444d428..f6041b201 100644
--- 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