Skip to content

Commit b259e8e

Browse files
committed
chore: fix operator build artifact folder location
1 parent f94dd6f commit b259e8e

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ jobs:
613613
- run:
614614
command: |
615615
OPERATOR_PATH=$(python scripts/operator/package_operator_bundle.py "${NEW_OPERATOR_VERSION}" "${NEW_OPERATOR_VERSION}" "${NEW_OPERATOR_VERSION}" "${LAST_OPERATOR_VERSION}")
616-
cp -r "${OPERATOR_PATH}/" snyk-operator/deploy/olm-catalog/snyk-operator/
616+
echo "export OPERATOR_PATH=${OPERATOR_PATH}" >> $BASH_ENV
617617
name: Package Operator Bundle
618618
- run:
619619
command: |

.circleci/config/jobs/push_operator_to_community_operators.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ steps:
4747
name: Package Operator Bundle
4848
command: |
4949
OPERATOR_PATH=$(python scripts/operator/package_operator_bundle.py "${NEW_OPERATOR_VERSION}" "${NEW_OPERATOR_VERSION}" "${NEW_OPERATOR_VERSION}" "${LAST_OPERATOR_VERSION}")
50-
cp -r "${OPERATOR_PATH}/" snyk-operator/deploy/olm-catalog/snyk-operator/
51-
50+
echo "export OPERATOR_PATH=${OPERATOR_PATH}" >> $BASH_ENV
5251
- run:
5352
name: Push new Operator to the fork of the community-operators repository
5453
command: |

.circleci/config/jobs/push_operator_to_upstream_community_operators.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ steps:
4747
name: Package Operator Bundle
4848
command: |
4949
OPERATOR_PATH=$(python scripts/operator/package_operator_bundle.py "${NEW_OPERATOR_VERSION}" "${NEW_OPERATOR_VERSION}" "${NEW_OPERATOR_VERSION}" "${LAST_OPERATOR_VERSION}")
50-
cp -r "${OPERATOR_PATH}/" snyk-operator/deploy/olm-catalog/snyk-operator/
50+
echo "export OPERATOR_PATH=${OPERATOR_PATH}" >> $BASH_ENV
5151
5252
- run:
5353
name: Push new Operator to the fork of the upstream-community-operators repository

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CURRENT_DIRECTORY=$1
1818
COMMUNITY_FOLDER_LOCATION=$2
1919
COMMUNITY_OPERATORS_UPSTREAM_LOCATION="${CURRENT_DIRECTORY}/community-operators"
2020
DEPLOY_LOCATION="${COMMUNITY_OPERATORS_UPSTREAM_LOCATION}/${COMMUNITY_FOLDER_LOCATION}"
21-
OPERATOR_LOCATION="${CURRENT_DIRECTORY}/snyk-operator/deploy/olm-catalog/snyk-operator"
2221

2322
# Configure git user and gpg key
2423
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_
4443
mkdir -p "${DEPLOY_LOCATION}/snyk-operator"
4544

4645
# Copy new release to branch
47-
cp -r "${OPERATOR_LOCATION}/${NEW_OPERATOR_VERSION}" "${DEPLOY_LOCATION}/snyk-operator/."
48-
cp "${OPERATOR_LOCATION}/snyk-operator.package.yaml" "${DEPLOY_LOCATION}/snyk-operator/."
46+
cp -r "${OPERATOR_PATH}/${NEW_OPERATOR_VERSION}" "${DEPLOY_LOCATION}/snyk-operator/."
47+
cp "${OPERATOR_PATH}/snyk-operator.package.yaml" "${DEPLOY_LOCATION}/snyk-operator/."
4948

5049
# Create the signed commit and push
5150
git add "${DEPLOY_LOCATION}/snyk-operator/*"

0 commit comments

Comments
 (0)