From af4a95a77052b85b2e14a7a10882dc0480cdf4b4 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Wed, 1 Apr 2020 11:53:06 -0600
Subject: [PATCH 1/3] Use the new name for license_scanning

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 522c134484..6ff725353d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -205,7 +205,7 @@ update-downstream-server-version:
   allow_failure: true
 
 include:
-  - template: Security/License-Management.gitlab-ci.yml
+  - template: Security/License-Scanning.gitlab-ci.yml
   - template: Security/SAST.gitlab-ci.yml
   - template: Security/Dependency-Scanning.gitlab-ci.yml
 
@@ -213,10 +213,10 @@ gosec-sast:
   before_script:
     - apk add pkgconfig libgit2-dev gcc libc-dev
 
-license_management:
+license_scanning:
   before_script:
-    - sudo apt-get update
-    - sudo apt-get install -y libicu-dev libgit2-dev cmake
+    - apt-get update
+    - apt-get install -y libicu-dev libgit2-dev cmake
   variables:
     LICENSE_FINDER_CLI_OPTS: '--aggregate-paths=. ruby'
 
-- 
GitLab


From 8ffd56789a05f9d74540831b691393fc36df3752 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Thu, 2 Apr 2020 07:14:19 +0000
Subject: [PATCH 2/3] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ff725353d..a595d11386 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -214,9 +214,11 @@ gosec-sast:
     - apk add pkgconfig libgit2-dev gcc libc-dev
 
 license_scanning:
+  image:
+    name: registry.gitlab.com/gitlab-org/security-products/license-management/tmp:bfd7459419921ff37ee500f0698862eea6788675
   before_script:
-    - apt-get update
-    - apt-get install -y libicu-dev libgit2-dev cmake
+    - sudo apt-get update
+    - sudo apt-get install -y libicu-dev libgit2-dev cmake
   variables:
     LICENSE_FINDER_CLI_OPTS: '--aggregate-paths=. ruby'
 
-- 
GitLab


From 60fb32533bbb91bc747e79c05a801e4897b06bf4 Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Thu, 2 Apr 2020 17:19:05 +0000
Subject: [PATCH 3/3] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a595d11386..774c99f2e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -214,8 +214,6 @@ gosec-sast:
     - apk add pkgconfig libgit2-dev gcc libc-dev
 
 license_scanning:
-  image:
-    name: registry.gitlab.com/gitlab-org/security-products/license-management/tmp:bfd7459419921ff37ee500f0698862eea6788675
   before_script:
     - sudo apt-get update
     - sudo apt-get install -y libicu-dev libgit2-dev cmake
-- 
GitLab