From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 12 Apr 2022 16:51:35 +0000 (+0200)
Subject: Add missing sudo calls in Docker scans
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=48b415952f08b7b4f0f1524bb2de8b606d533e71;p=releng.git

Add missing sudo calls in Docker scans

Change-Id: I9c9285d41de025ac549370c20d09606a79ae3ab0
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 72e273077..f32bc9c27 100644
--- a/jjb/functest/functest-kubernetes-ng.yaml
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -385,9 +385,9 @@
     name: functest-kubernetes-ng-docker-scan
     builders:
       - shell: |
-          apt-get -o DPkg::Lock::Timeout=300 update && \
-          DEBIAN_FRONTEND=noninteractive apt-get -o DPkg::Lock::Timeout=300 install \
-            curl docker.io -y
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl docker.io -y
 
           mkdir -p ~/.docker/cli-plugins && \
           curl https://github.com/docker/scan-cli-plugin/releases/latest/download/docker-scan_linux_amd64 \
@@ -400,7 +400,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          docker-scan $image
+          sudo docker scan $image
 
 - job-template:
     name: 'functest-kubernetes-ng-{repo}-{container}-{tag}-docker-scan'
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 4354896aa..a790b961b 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -1287,8 +1287,8 @@
     builders:
       - shell: |
           apt-get -o DPkg::Lock::Timeout=300 update && \
-          DEBIAN_FRONTEND=noninteractive apt-get -o DPkg::Lock::Timeout=300 install \
-            curl docker.io -y
+          DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl docker.io -y
 
           mkdir -p ~/.docker/cli-plugins && \
           curl https://github.com/docker/scan-cli-plugin/releases/latest/download/docker-scan_linux_amd64 \
@@ -1301,7 +1301,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          docker-scan $image
+          docker scan $image
 
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-docker-scan'
@@ -1402,4 +1402,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z0-9.]+-docker-scan$
+    regex: (?!functest-kubernetes-pi)(?!functest-kubernetes-ng)^functest-kubernetes-[a-z-0-9.]+-docker-scan$
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 11be70f66..b47f3fa54 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -1649,9 +1649,9 @@
     name: functest-docker-scan
     builders:
       - shell: |
-          apt-get -o DPkg::Lock::Timeout=300 update && \
-          DEBIAN_FRONTEND=noninteractive apt-get -o DPkg::Lock::Timeout=300 install \
-            curl docker.io -y
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl docker.io -y
 
           mkdir -p ~/.docker/cli-plugins && \
           curl https://github.com/docker/scan-cli-plugin/releases/latest/download/docker-scan_linux_amd64 \
@@ -1664,7 +1664,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          docker-scan $image
+          sudo docker scan $image
 
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-docker-scan'
@@ -1779,4 +1779,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z0-9.]+-docker-scan$
+    regex: (?!functest-kubernetes)(?!functest-pi)^functest-[a-z-0-9.]+-docker-scan$
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 1638e5e71..efe7daab7 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -853,9 +853,9 @@
     name: xtesting-docker-scan
     builders:
       - shell: |
-          apt-get -o DPkg::Lock::Timeout=300 update && \
-          DEBIAN_FRONTEND=noninteractive apt-get -o DPkg::Lock::Timeout=300 install \
-            curl docker.io -y
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl docker.io -y
 
           mkdir -p ~/.docker/cli-plugins && \
           curl https://github.com/docker/scan-cli-plugin/releases/latest/download/docker-scan_linux_amd64 \
@@ -868,7 +868,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          docker-scan $image
+          sudo docker scan $image
 
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-docker-scan'
@@ -941,4 +941,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z0-9.]+-docker-scan$
+    regex: (?!xtesting-pi)^xtesting-[a-z-0-9.]+-docker-scan$