Merge pull request #621 from snyk/chore/fix-operator-release-folder

chore: fix operator build artifact folder location

Author: dkontorovskyy

.circleci/config.yml

@@ -613,7 +613,7 @@ jobs:
             - run:
                 command: |
                     OPERATOR_PATH=$(python scripts/operator/package_operator_bundle.py "${NEW_OPERATOR_VERSION}" "${NEW_OPERATOR_VERSION}" "${NEW_OPERATOR_VERSION}" "${LAST_OPERATOR_VERSION}")
-                    cp -r "${OPERATOR_PATH}/" snyk-operator/deploy/olm-catalog/snyk-operator/
+                    echo "export OPERATOR_PATH=${OPERATOR_PATH}" >> $BASH_ENV
                 name: Package Operator Bundle
             - run:
                 command: |

.circleci/config/jobs/push_operator_to_community_operators.yml

@@ -47,8 +47,7 @@ steps:
       name: Package Operator Bundle
       command: |
         OPERATOR_PATH=$(python scripts/operator/package_operator_bundle.py "${NEW_OPERATOR_VERSION}" "${NEW_OPERATOR_VERSION}" "${NEW_OPERATOR_VERSION}" "${LAST_OPERATOR_VERSION}")
-        cp -r "${OPERATOR_PATH}/" snyk-operator/deploy/olm-catalog/snyk-operator/
-
+        echo "export OPERATOR_PATH=${OPERATOR_PATH}" >> $BASH_ENV
   - run:
       name: Push new Operator to the fork of the community-operators repository
       command: |

.circleci/config/jobs/push_operator_to_upstream_community_operators.yml

@@ -47,7 +47,7 @@ steps:
       name: Package Operator Bundle
       command: |
         OPERATOR_PATH=$(python scripts/operator/package_operator_bundle.py "${NEW_OPERATOR_VERSION}" "${NEW_OPERATOR_VERSION}" "${NEW_OPERATOR_VERSION}" "${LAST_OPERATOR_VERSION}")
-        cp -r "${OPERATOR_PATH}/" snyk-operator/deploy/olm-catalog/snyk-operator/
+        echo "export OPERATOR_PATH=${OPERATOR_PATH}" >> $BASH_ENV
 
   - run:
       name: Push new Operator to the fork of the upstream-community-operators repository

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

@@ -18,7 +18,6 @@ CURRENT_DIRECTORY=$1
 COMMUNITY_FOLDER_LOCATION=$2
 COMMUNITY_OPERATORS_UPSTREAM_LOCATION="${CURRENT_DIRECTORY}/community-operators"
 DEPLOY_LOCATION="${COMMUNITY_OPERATORS_UPSTREAM_LOCATION}/${COMMUNITY_FOLDER_LOCATION}"
-OPERATOR_LOCATION="${CURRENT_DIRECTORY}/snyk-operator/deploy/olm-catalog/snyk-operator"
 
 # Configure git user and gpg key
 echo "${OPENSHIFT_OPERATOR_SIGNING_KEY_BASE64}" | base64 -d | gpg --import
@@ -44,8 +43,8 @@ git checkout -b snyk/${COMMUNITY_FOLDER_LOCATION}/snyk-operator-v${NEW_OPERATOR_
 mkdir -p  "${DEPLOY_LOCATION}/snyk-operator"
 
 # Copy new release to branch
-cp -r "${OPERATOR_LOCATION}/${NEW_OPERATOR_VERSION}" "${DEPLOY_LOCATION}/snyk-operator/."
-cp "${OPERATOR_LOCATION}/snyk-operator.package.yaml" "${DEPLOY_LOCATION}/snyk-operator/."
+cp -r "${OPERATOR_PATH}/${NEW_OPERATOR_VERSION}" "${DEPLOY_LOCATION}/snyk-operator/."
+cp "${OPERATOR_PATH}/snyk-operator.package.yaml" "${DEPLOY_LOCATION}/snyk-operator/."
 
 # Create the signed commit and push
 git add "${DEPLOY_LOCATION}/snyk-operator/*"