Merge pull request #800 from snyk/chore/sync-community-operators-fork

[RUN-1589] Chore/sync community operators fork

Author: ivanstanev

.circleci/config.yml

@@ -759,6 +759,38 @@ jobs:
                 name: Notify Slack on failure
                 when: on_fail
         working_directory: ~/kubernetes-monitor
+    sync_community_operators_with_snyk_fork:
+        docker:
+            - auth:
+                password: $DOCKERHUB_PASSWORD
+                username: $DOCKERHUB_USER
+              image: cimg/python:3.9.5
+        steps:
+            - checkout
+            - install_python_requests
+            - add_ssh_keys:
+                fingerprints:
+                    - 06:c3:d4:10:0d:ef:37:6c:ec:b9:fb:6e:ed:09:e7:40
+            - run:
+                command: |
+                    CURRENT_DIRECTORY=$(pwd)
+                    COMMUNITY_FOLDER_LOCATION="${CURRENT_DIRECTORY}/community-operators"
+
+                    # Clone Community Operators repo from Snyk
+                    git clone https://github.com/snyk/community-operators.git "${COMMUNITY_FOLDER_LOCATION}"
+                    cd "${COMMUNITY_FOLDER_LOCATION}"
+
+                    # Sync snyk/community-operators repo from operator-framework/community-operators repo
+                    git remote add upstream https://github.com/operator-framework/community-operators.git
+                    git fetch upstream
+                    git merge upstream/master
+                    git push origin master
+                name: Sync operator-framework/community-operators with snyk/community-operators
+            - run:
+                command: ./scripts/slack/notify_failure.py "${CIRCLE_BRANCH}" "${CIRCLE_JOB}" "${CIRCLE_BUILD_URL}" "${CIRCLE_PULL_REQUEST}" "${SLACK_WEBHOOK}"
+                name: Notify Slack on failure
+                when: on_fail
+        working_directory: ~/kubernetes-monitor
     system_tests:
         machine:
             docker_layer_caching: true
@@ -872,20 +904,27 @@ workflows:
                             - master
                 requires:
                     - hold
-            - push_operator_to_community_operators:
+            - sync_community_operators_with_snyk_fork:
                 filters:
                     branches:
                         only:
                             - master
                 requires:
                     - operator_upgrade_tests
+            - push_operator_to_community_operators:
+                filters:
+                    branches:
+                        only:
+                            - master
+                requires:
+                    - sync_community_operators_with_snyk_fork
             - push_operator_to_upstream_community_operators:
                 filters:
                     branches:
                         only:
                             - master
                 requires:
-                    - operator_upgrade_tests
+                    - sync_community_operators_with_snyk_fork
     MERGE_TO_MASTER:
         jobs:
             - publish:

.circleci/config/@config.yml

@@ -144,11 +144,15 @@ workflows:
           <<: *master_branch_only_filter
           requires:
             - hold
-      - push_operator_to_community_operators:
+      - sync_community_operators_with_snyk_fork:
           <<: *master_branch_only_filter
           requires:
             - operator_upgrade_tests
+      - push_operator_to_community_operators:
+          <<: *master_branch_only_filter
+          requires:
+            - sync_community_operators_with_snyk_fork
       - push_operator_to_upstream_community_operators:
           <<: *master_branch_only_filter
           requires:
-            - operator_upgrade_tests
+            - sync_community_operators_with_snyk_fork

.circleci/config/jobs/sync_community_operators_with_snyk_fork.yml

@@ -0,0 +1,31 @@
+docker:
+  - image: cimg/python:3.9.5
+    auth:
+      username: $DOCKERHUB_USER
+      password: $DOCKERHUB_PASSWORD
+working_directory: ~/kubernetes-monitor
+steps:
+  - checkout
+  - install_python_requests
+  - add_ssh_keys:
+      fingerprints:
+        - 06:c3:d4:10:0d:ef:37:6c:ec:b9:fb:6e:ed:09:e7:40
+  - run:
+      name: Sync operator-framework/community-operators with snyk/community-operators
+      command: |
+        CURRENT_DIRECTORY=$(pwd)
+        COMMUNITY_FOLDER_LOCATION="${CURRENT_DIRECTORY}/community-operators"
+
+        # Clone Community Operators repo from Snyk
+        git clone https://github.com/snyk/community-operators.git "${COMMUNITY_FOLDER_LOCATION}"
+        cd "${COMMUNITY_FOLDER_LOCATION}"
+
+        # Sync snyk/community-operators repo from operator-framework/community-operators repo
+        git remote add upstream https://github.com/operator-framework/community-operators.git
+        git fetch upstream
+        git merge upstream/master
+        git push origin master
+  - run:
+      name: Notify Slack on failure
+      command: ./scripts/slack/notify_failure.py "${CIRCLE_BRANCH}" "${CIRCLE_JOB}" "${CIRCLE_BUILD_URL}" "${CIRCLE_PULL_REQUEST}" "${SLACK_WEBHOOK}"
+      when: on_fail

scripts/operator/push-operator-to-snyk-upstream.sh

@@ -30,12 +30,6 @@ git config --global user.name "${OPENSHIFT_OPERATOR_GITHUB_NAME}"
 git clone https://github.com/snyk/community-operators.git $COMMUNITY_OPERATORS_UPSTREAM_LOCATION
 cd "${COMMUNITY_OPERATORS_UPSTREAM_LOCATION}"
 
-# Sync snyk/community-operators repo from operator-framework/community-operators repo
-git remote add upstream https://github.com/operator-framework/community-operators.git
-git fetch upstream
-git merge upstream/master
-git push origin master
-
 # Checkout branch for new snyk-operator version on community folder
 git checkout -b snyk/${COMMUNITY_FOLDER_LOCATION}/snyk-operator-v${NEW_OPERATOR_VERSION}