Fix trivy calls (2)

This reverts commit fbbbfccd6b83c2a47f9a8ac9b71447d01c5e67a2.

Change-Id: I3d99a768cc3a1d56190cce164c7935e138ad8d45
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index b9353f9..bbe8499 100644 (file)
--- a/jjb/functest/functest-kubernetes-ng.yaml
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -320,7 +320,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          ./trivy $image
+          ./trivy image --exit-code 1 $image
 
 - job-template:
     name: 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 6cf3093..1634473 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -1261,7 +1261,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          ./trivy $image
+          ./trivy image --exit-code 1 $image
 
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-trivy'

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index c0d57d1..6660e68 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -1613,7 +1613,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          ./trivy $image
+          ./trivy image --exit-code 1 $image
 
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-trivy'

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index e4000a4..66a108d 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -847,7 +847,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          ./trivy $image
+          ./trivy image --exit-code 1 $image
 
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-trivy'