From ac206a1d2a6e51a5a837cd17dc3101a4f53b9c8c Mon Sep 17 00:00:00 2001
From: Franck Dehay <franck.dehay@orange.com>
Date: Fri, 5 Feb 2021 11:45:42 +0100
Subject: [PATCH 1/3] updated base circleci image

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bd968e897..7fcc1e363 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ orbs:
     executors:
       vm:
         machine:
-          image: ubuntu-1604:201903-01
+          image: ubuntu-2004:202010-01
         resource_class: large
     jobs:
       e2e-orb:

From 865f67afaf1f69f4b4abd89baba9460f16f33773 Mon Sep 17 00:00:00 2001
From: Franck Dehay <franck.dehay@orange.com>
Date: Fri, 5 Feb 2021 15:18:11 +0100
Subject: [PATCH 2/3] Skip Sonarqube scan & publish

---
 .circleci/config.yml | 59 +++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7fcc1e363..3a5d1793a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -278,34 +278,37 @@ orbs:
               paths:
                 - sonar-scanner-3.3.0.1492-linux
                 - /home/circleci/<< parameters.operatorDir >>/.sonar
-          - run: # Run sonar scan
-              name: Sonarcloud Scan
-              command: |
-                ./sonar-scanner-3.3.0.1492-linux/bin/sonar-scanner -X \
-                -Dsonar.projectName=<< parameters.operatorName >> \
-                -Dsonar.projectKey=${SONAR_PROJECT} \
-                -Dsonar.login=${SONAR_TOKEN} \
-                -Dsonar.branch.name=${CIRCLE_BRANCH} \
-                -Dsonar.organization=${SONAR_ORGANISATION} \
-                -Dsonar.host.url=https://sonarcloud.io \
-                -Dsonar.projectBaseDir=/home/circleci/<< parameters.operatorDir >> \
-                -Dsonar.sources=. \
-                -Dsonar.sources.inclusions="**/**.go" \
-                -Dsonar.exclusions="**/*_test.go,**/vendor/**,**/sonar-scanner-3.3.0.1492-linux/**,**docs/**" \
-                -Dsonar.coverage.exclusions="**/vendor/**,**/test/**,**docs/**" \
-                -Dsonar.tests=. \
-                -Dsonar.language=go \
-                -Dsonar.sourceEncoding=UTF-8 \
-                -Dsonar.test.inclusions="**/**_test.go" \
-                -Dsonar.test.exclusions="**/vendor/**" \
-                -Dsonar.go.coverage.reportPaths=coverage.out \
-                -Dsonar.go.tests.reportPaths=test-report.out \
-                -Dsonar.coverage.dtdVerification=false \
-                -Dsonar.log.level=INFO
-                cat -n .scannerwork/report-task.txt
+          - run: # Check jdk version
+              name: Check / install jdk
+              command: lsb_release -a
+#          - run: # Run sonar scan
+#              name: Sonarcloud Scan
+#              command: |
+#                ./sonar-scanner-3.3.0.1492-linux/bin/sonar-scanner -X \
+#                -Dsonar.projectName=<< parameters.operatorName >> \
+#                -Dsonar.projectKey=${SONAR_PROJECT} \
+#                -Dsonar.login=${SONAR_TOKEN} \
+#                -Dsonar.branch.name=${CIRCLE_BRANCH} \
+#                -Dsonar.organization=${SONAR_ORGANISATION} \
+#                -Dsonar.host.url=https://sonarcloud.io \
+#                -Dsonar.projectBaseDir=/home/circleci/<< parameters.operatorDir >> \
+#                -Dsonar.sources=. \
+#                -Dsonar.sources.inclusions="**/**.go" \
+#                -Dsonar.exclusions="**/*_test.go,**/vendor/**,**/sonar-scanner-3.3.0.1492-linux/**,**docs/**" \
+#                -Dsonar.coverage.exclusions="**/vendor/**,**/test/**,**docs/**" \
+#                -Dsonar.tests=. \
+#                -Dsonar.language=go \
+#                -Dsonar.sourceEncoding=UTF-8 \
+#                -Dsonar.test.inclusions="**/**_test.go" \
+#                -Dsonar.test.exclusions="**/vendor/**" \
+#                -Dsonar.go.coverage.reportPaths=coverage.out \
+#                -Dsonar.go.tests.reportPaths=test-report.out \
+#                -Dsonar.coverage.dtdVerification=false \
+#                -Dsonar.log.level=INFO
+#                cat -n .scannerwork/report-task.txt
           # Artifacts definitions
-          - store_test_results: # Store sonar scan reports
-              path: reports
+#          - store_test_results: # Store sonar scan reports
+#              path: reports
 
       publish-helm:
         <<: *params_operator
@@ -497,7 +500,7 @@ workflows:
       - operator/publish-helm:
           name: publish-helm-orange-incubator-casskop
           requires:
-            - report-casskop
+            - kuttl-test ScaleUpAndDown
           <<: *only_on_release_tag
 
       - deploy-website:

From c4502a6902d4e821255ed534aeb9e7fc0e2127c9 Mon Sep 17 00:00:00 2001
From: Franck Dehay <franck.dehay@orange.com>
Date: Fri, 5 Feb 2021 15:23:57 +0100
Subject: [PATCH 3/3] Remove jdk check

---
 .circleci/config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3a5d1793a..dd65289be 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -278,9 +278,6 @@ orbs:
               paths:
                 - sonar-scanner-3.3.0.1492-linux
                 - /home/circleci/<< parameters.operatorDir >>/.sonar
-          - run: # Check jdk version
-              name: Check / install jdk
-              command: lsb_release -a
 #          - run: # Run sonar scan
 #              name: Sonarcloud Scan
 #              command: |