chore: circleci config for OpenShift 4 integration tests

ivanstanev · ivanstanev · commit 86395a460ac5 · 2021-03-26T16:35:09.000Z
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -42,17 +42,11 @@ jobs:
             - checkout
             - setup_remote_docker
             - install_python_requests
-            - run:
-                command: pip install operator-courier==2.1.7
-                name: Install operator-courier
             - run:
                 command: |
-                    RELEASE_VERSION=v0.15.1
-                    DOWNLOAD_LOCATION=./operator-sdk
-                    CURL_FOLLOW_REDIRECTS="-L"
-                    curl ${CURL_FOLLOW_REDIRECTS} https://github.com/operator-framework/operator-sdk/releases/download/${RELEASE_VERSION}/operator-sdk-${RELEASE_VERSION}-x86_64-linux-gnu -o ${DOWNLOAD_LOCATION}
-                    chmod +x ${DOWNLOAD_LOCATION}
-                name: Download Operator SDK
+                    scripts/operator/download_operator_sdk.py
+                    scripts/operator/download_operator_package_manager.py
+                name: Download Operator SDK and Operator Package Manager
             - run:
                 command: |
                     export IMAGE_TAG=$([[ "$CIRCLE_BRANCH" == "staging" ]] && echo "staging-candidate" || echo "discardable")
@@ -71,16 +65,10 @@ jobs:
                 name: Package Operator Bundle
             - run:
                 command: |
-                    if [ "$CIRCLE_BRANCH" != "staging" ]; then
-                      exit 0
-                    fi
-                    export QUAY_TOKEN=$(scripts/operator/get_quay_token.py "${QUAY_USERNAME}" "${QUAY_PASSWORD}")
                     export OPERATOR_DIR=$OPERATOR_PATH
-                    export QUAY_NAMESPACE=snyk-runtime
-                    export PACKAGE_NAME=snyk-operator
                     export PACKAGE_VERSION="0.0.1-${CIRCLE_SHA1}"
-                    operator-courier push "${OPERATOR_DIR}" "${QUAY_NAMESPACE}" "${PACKAGE_NAME}" "${PACKAGE_VERSION}" "${QUAY_TOKEN}"
-                name: Upload Operator to Quay
+                    scripts/operator/create_operator_bundle_and_index_and_push.py "${OPERATOR_DIR}" "${PACKAGE_VERSION}" "${DOCKERHUB_USER}" "${DOCKERHUB_PASSWORD}"
+                name: Create Operator Bundle and Index and push to Docker Hub
             - run:
                 command: |
                     ./scripts/slack/notify_failure_on_branch.py "${CIRCLE_BRANCH}" "${CIRCLE_JOB}" "${CIRCLE_BUILD_URL}" "${CIRCLE_PULL_REQUEST}" "${SLACK_WEBHOOK}"
@@ -109,21 +97,6 @@ jobs:
                 name: Notify Slack on failure
                 when: on_fail
         working_directory: ~/kubernetes-monitor
-    delete_operators_from_quay:
-        docker:
-            - auth:
-                password: $DOCKERHUB_PASSWORD
-                username: $DOCKERHUB_USER
-              image: circleci/python:3.9
-        steps:
-            - checkout
-            - install_python_requests
-            - run:
-                command: |
-                    python3 scripts/operator/delete_operators_from_quay.py "${QUAY_USERNAME}" "${QUAY_PASSWORD}"
-                name: Delete Operators from Quay
-                when: always
-        working_directory: ~/kubernetes-monitor
     deploy_dev:
         docker:
             - auth:
@@ -266,11 +239,6 @@ jobs:
                     export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
                     .circleci/do-exclusively --branch staging --job ${CIRCLE_JOB} npm run test:integration:kindolm:operator
                 name: Operator integration tests on plain k8s
-            - run:
-                command: |
-                    scripts/operator/delete_operators_from_quay.py "${QUAY_USERNAME}" "${QUAY_PASSWORD}"
-                name: Delete Operators from Quay
-                when: always
             - run:
                 command: |
                     ./scripts/slack/notify_failure_on_branch.py "${CIRCLE_BRANCH}" "${CIRCLE_JOB}" "${CIRCLE_BUILD_URL}" "${CIRCLE_PULL_REQUEST}" "${SLACK_WEBHOOK}"
@@ -342,10 +310,7 @@ jobs:
                 name: create temp dir for logs
             - run:
                 command: |
-                    echo "${OPENSHIFT4_ETC_HOSTS_ENTRY}" | sudo tee -a /etc/hosts
-                name: Append an entry to the test environment to /etc/hosts
-            - run:
-                command: |
+                    export OPERATOR_VERSION="0.0.1-${CIRCLE_SHA1}"
                     export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
                     .circleci/do-exclusively --branch staging --job ${CIRCLE_JOB} npm run test:integration:openshift4:operator
                 name: Integration tests OpenShift 4
@@ -957,14 +922,6 @@ workflows:
                 requires:
                     - build_image
                     - build_and_upload_operator
-            - delete_operators_from_quay:
-                filters:
-                    branches:
-                        only:
-                            - staging
-                requires:
-                    - integration_tests_operator_on_k8s
-                    - openshift4_integration_tests
             - tag_and_push:
                 filters:
                     branches:
diff --git a/.circleci/config/@config.yml b/.circleci/config/@config.yml
@@ -79,11 +79,6 @@ workflows:
             - build_image
             - build_and_upload_operator
           <<: *staging_branch_only_filter
-      - delete_operators_from_quay:
-          requires:
-            - integration_tests_operator_on_k8s
-            - openshift4_integration_tests
-          <<: *staging_branch_only_filter
       - tag_and_push:
           requires:
             - build_image
diff --git a/.circleci/config/jobs/@jobs.yml b/.circleci/config/jobs/@jobs.yml
@@ -33,16 +33,10 @@ build_and_upload_operator:
     - setup_remote_docker
     - install_python_requests
     - run:
-        name: Install operator-courier
-        command: pip install operator-courier==2.1.7
-    - run:
-        name: Download Operator SDK
+        name: Download Operator SDK and Operator Package Manager
         command: |
-          RELEASE_VERSION=v0.15.1
-          DOWNLOAD_LOCATION=./operator-sdk
-          CURL_FOLLOW_REDIRECTS="-L"
-          curl ${CURL_FOLLOW_REDIRECTS} https://github.com/operator-framework/operator-sdk/releases/download/${RELEASE_VERSION}/operator-sdk-${RELEASE_VERSION}-x86_64-linux-gnu -o ${DOWNLOAD_LOCATION}
-          chmod +x ${DOWNLOAD_LOCATION}
+          scripts/operator/download_operator_sdk.py
+          scripts/operator/download_operator_package_manager.py
     - run:
         name: Create Operator and push Operator image to DockerHub
         command: |
@@ -60,17 +54,11 @@ build_and_upload_operator:
           OPERATOR_PATH=$(scripts/operator/package_operator_bundle.py "${SNYK_OPERATOR_VERSION}" "${SNYK_OPERATOR_IMAGE_TAG}" "${SNYK_MONITOR_IMAGE_TAG}")
           echo "export OPERATOR_PATH=$OPERATOR_PATH" >> $BASH_ENV
     - run:
-        name: Upload Operator to Quay
+        name: Create Operator Bundle and Index and push to Docker Hub
         command: |
-          if [ "$CIRCLE_BRANCH" != "staging" ]; then
-            exit 0
-          fi
-          export QUAY_TOKEN=$(scripts/operator/get_quay_token.py "${QUAY_USERNAME}" "${QUAY_PASSWORD}")
           export OPERATOR_DIR=$OPERATOR_PATH
-          export QUAY_NAMESPACE=snyk-runtime
-          export PACKAGE_NAME=snyk-operator
           export PACKAGE_VERSION="0.0.1-${CIRCLE_SHA1}"
-          operator-courier push "${OPERATOR_DIR}" "${QUAY_NAMESPACE}" "${PACKAGE_NAME}" "${PACKAGE_VERSION}" "${QUAY_TOKEN}"
+          scripts/operator/create_operator_bundle_and_index_and_push.py "${OPERATOR_DIR}" "${PACKAGE_VERSION}" "${DOCKERHUB_USER}" "${DOCKERHUB_PASSWORD}"
     - run:
         name: Notify Slack on failure
         command: |
@@ -278,13 +266,10 @@ openshift4_integration_tests:
     - run:
         name: create temp dir for logs
         command: mkdir -p /tmp/logs/test/integration/openshift4
-    - run:
-        name: Append an entry to the test environment to /etc/hosts
-        command: |
-          echo "${OPENSHIFT4_ETC_HOSTS_ENTRY}" | sudo tee -a /etc/hosts
     - run:
         name: Integration tests OpenShift 4
         command: |
+          export OPERATOR_VERSION="0.0.1-${CIRCLE_SHA1}"
           export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
           .circleci/do-exclusively --branch staging --job ${CIRCLE_JOB} npm run test:integration:openshift4:operator
     - run:
@@ -295,22 +280,6 @@ openshift4_integration_tests:
     - store_artifacts:
         path: /tmp/logs/test/integration/openshift4
 
-delete_operators_from_quay:
-  docker:
-    - image: circleci/python:3.9
-      auth:
-        username: $DOCKERHUB_USER
-        password: $DOCKERHUB_PASSWORD
-  working_directory: ~/kubernetes-monitor
-  steps:
-    - checkout
-    - install_python_requests
-    - run:
-        name: Delete Operators from Quay
-        command: |
-          python3 scripts/operator/delete_operators_from_quay.py "${QUAY_USERNAME}" "${QUAY_PASSWORD}"
-        when: always
-
 ######################## MERGE TO STAGING ########################
 tag_and_push:
   docker:
diff --git a/.circleci/config/jobs/integration_tests_operator_on_k8s.yml b/.circleci/config/jobs/integration_tests_operator_on_k8s.yml
@@ -14,11 +14,6 @@ steps:
       export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
       .circleci/do-exclusively --branch staging --job ${CIRCLE_JOB} npm run test:integration:kindolm:operator
     name: Operator integration tests on plain k8s
-- run:
-    name: Delete Operators from Quay
-    command: |
-      scripts/operator/delete_operators_from_quay.py "${QUAY_USERNAME}" "${QUAY_PASSWORD}"
-    when: always
 - run:
     command: |
       ./scripts/slack/notify_failure_on_branch.py "${CIRCLE_BRANCH}" "${CIRCLE_JOB}" "${CIRCLE_BUILD_URL}" "${CIRCLE_PULL_REQUEST}" "${SLACK_WEBHOOK}"
diff --git a/scripts/operator/create_operator.py b/scripts/operator/create_operator.py
@@ -23,7 +23,7 @@
 from tempfile import mkdtemp
 from subprocess import call
 from os import chdir
-from shutil import copy, copytree, rmtree
+from shutil import copy, copytree
 
 
 def createOperatorAndBuildOperatorImage(operator_name_and_tag: str, monitor_tag: str) -> None:
@@ -56,8 +56,6 @@ def createOperatorAndBuildOperatorImage(operator_name_and_tag: str, monitor_tag:
     call([operator_sdk_path, "build", operator_name_and_tag])
     chdir(return_path)
 
-    rmtree(new_operator_dir)
-
 
 if __name__ == '__main__':
     _, operator_name_and_tag, monitor_tag = argv
diff --git a/scripts/operator/create_operator_bundle_and_index_and_push.py b/scripts/operator/create_operator_bundle_and_index_and_push.py
@@ -3,6 +3,7 @@
 from os import chdir, environ, getcwd
 from subprocess import call
 from shutil import copy
+from sys import argv
 
 
 def createOperatorBundleAndIndexAndPushToDockerHub(operator_path: str, new_operator_tag: str, dockerhub_user: str, dockerhub_password: str) -> None:
@@ -24,3 +25,9 @@ def createOperatorBundleAndIndexAndPushToDockerHub(operator_path: str, new_opera
           ":" + new_operator_tag, "--tag", "snyk/kubernetes-operator-index" + ":" + new_operator_tag])
     call(["docker", "push", "snyk/kubernetes-operator-index" + ":" + new_operator_tag])
     chdir(return_dir)
+
+
+if __name__ == '__main__':
+    _, operator_path, new_operator_tag, dockerhub_user, dockerhub_password = argv
+    createOperatorBundleAndIndexAndPushToDockerHub(
+        operator_path, new_operator_tag, dockerhub_user, dockerhub_password)
diff --git a/scripts/operator/download_operator_package_manager.py b/scripts/operator/download_operator_package_manager.py
@@ -18,7 +18,8 @@ def downloadOperatorPackageManager() -> None:
         opm = get(
             "https://github.com/operator-framework/operator-registry/releases/download/v1.16.1/darwin-amd64-opm")
     else:
-        raise RuntimeError("Unsupported system " + current_sys)
+        opm = get(
+            "https://github.com/operator-framework/operator-registry/releases/download/v1.16.1/linux-amd64-opm")
 
     with open(operator_package_manager_path, "wb") as f:
         f.write(opm.content)
diff --git a/scripts/operator/download_operator_sdk.py b/scripts/operator/download_operator_sdk.py
@@ -21,7 +21,8 @@ def downloadOperatorSdk() -> None:
         sdk = get(
             "https://github.com/operator-framework/operator-sdk/releases/download/v0.15.1/operator-sdk-v0.15.1-x86_64-apple-darwin")
     else:
-        raise RuntimeError("Unsupported system " + current_sys)
+        sdk = get(
+            "https://github.com/operator-framework/operator-sdk/releases/download/v0.15.1/operator-sdk-v0.15.1-x86_64-linux-gnu")
 
     with open(operator_sdk_path, "wb") as f:
         f.write(sdk.content)
diff --git a/scripts/operator/main.py b/scripts/operator/main.py
@@ -14,10 +14,9 @@
 - DOCKERHUB_PASSWORD
 """
 
-from os import environ, remove
+from os import environ, remove, getcwd
 from hashlib import sha1
 from datetime import datetime
-from shutil import rmtree
 from subprocess import call
 from download_operator_package_manager import downloadOperatorPackageManager
 from create_operator_and_push import createOperatorAndPushToDockerHub
@@ -29,7 +28,7 @@
     random_digest = sha1(str(datetime.now()).encode("utf-8")).hexdigest()
     operator_version = "0.0.1-" + random_digest
 
-    with open(".operator_version", "w") as f:
+    with open(getcwd() + "/" + ".operator_version", "w") as f:
         f.write(operator_version)
 
     try:
@@ -46,7 +45,6 @@
     downloadOperatorSdk()
     print("Downloading Operator Package Manager")
     downloadOperatorPackageManager()
-    call(["pip3", "install", "operator-courier==2.1.7"])
 
     print("Creating Operator image and pushing to DockerHub")
     dockerhub_user = environ['DOCKERHUB_USER']
@@ -65,6 +63,5 @@
     print("Operator version " + operator_version +
           " has been pushed to Docker Hub")
 
-    # rmtree(operator_path)
-    # remove("operator-sdk")
-    # remove("opm")
+    remove("operator-sdk")
+    remove("opm")
diff --git a/scripts/operator/package_operator_bundle.py b/scripts/operator/package_operator_bundle.py
@@ -48,6 +48,7 @@ def createOperatorFromTemplate(new_version: str, new_operator_tag: str, new_moni
 
     copytree("snyk-operator/certified-operator",
              new_operator_dir + "/" + "certified-operator")
+    mkdir(new_operator_dir + "/" + "certified-operator/bundle/manifests")
     copy(new_csv_path, new_operator_dir + "/" + "certified-operator/bundle/manifests" +
          "/" + "snyk-operator.v" + new_version + ".clusterserviceversion.yaml")
     copy(new_crd_path, new_operator_dir + "/" + "certified-operator/bundle/manifests" +
diff --git a/test/setup/deployers/operator-openshift.ts b/test/setup/deployers/operator-openshift.ts
@@ -23,7 +23,8 @@ async function deployKubernetesMonitor(
 
 function createTestOperatorSource(newYamlPath: string): void {
   console.log('Creating YAML CatalogSource...');
-  const operatorVersion = readFileSync('.operator_version', 'utf8');
+  const operatorVersion =
+    process.env.OPERATOR_VERSION ?? readFileSync('./.operator_version', 'utf8');
   const originalCatalogSourceYaml = readFileSync(
     './test/fixtures/operator/catalog-source.yaml',
     'utf8',
