From b10bd2efe7da38156f48feeadbf2765249e9d84d Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Thu, 21 Apr 2022 17:09:57 +0200
Subject: [PATCH] Fix trivy calls (2)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This reverts commit fbbbfccd6b83c2a47f9a8ac9b71447d01c5e67a2.

Change-Id: I3d99a768cc3a1d56190cce164c7935e138ad8d45
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/functest-kubernetes-ng.yaml | 2 +-
 jjb/functest/functest-kubernetes.yaml    | 2 +-
 jjb/functest/functest.yaml               | 2 +-
 jjb/functest/xtesting.yaml               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index b9353f98f..bbe849987 100644
--- 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 6cf3093ad..1634473b0 100644
--- 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 c0d57d10b..6660e6826 100644
--- 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 e4000a45b..66a108d8c 100644
--- 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'
-- 
2.16.6