Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove 'v' prefix from module-tag in workflows #506

Merged
merged 4 commits into from
Nov 24, 2023
Merged

Remove 'v' prefix from module-tag in workflows #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39d08c5
Remove 'v' prefix from module-tag in promotion workflow
MarekMichali Nov 24, 2023
9653164
Remove 'v' from release workflow
MarekMichali Nov 24, 2023
4adb5a8
Remove 'v' from release workflow
MarekMichali Nov 24, 2023
e2337ac
Remove 'v' from release workflow
MarekMichali Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/create-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
BTP_OPERATOR_REPO: ${{ env.MODULE_REPO }}
BTP_MANAGER_REPO: ${{ env.IMAGE_REPO }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: "./scripts/check_artifacts_existence.sh ${{ inputs.name }} v${{ inputs.name }}"
run: "./scripts/check_artifacts_existence.sh ${{ inputs.name }} ${{ inputs.name }}"

- name: Validate Labels
env:
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
secrets: inherit
with:
image-tag: ${{ github.event.inputs.name }}
module-tag: v${{ github.event.inputs.name }}
module-tag: ${{ github.event.inputs.name }}
image-repo: europe-docker.pkg.dev/kyma-project/prod/btp-manager
module-repo: europe-docker.pkg.dev/kyma-project/prod/unsigned/component-descriptors/kyma.project.io/module/btp-operator
credentials-mode: ${{ github.event.inputs.credentials }}
Expand All @@ -190,11 +190,11 @@ jobs:
BTP_OPERATOR_REPO: ${{ env.MODULE_REPO }}
BTP_MANAGER_REPO: ${{ env.IMAGE_REPO }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: "./scripts/await_artifacts.sh ${{ inputs.name }} v${{ inputs.name }}"
run: "./scripts/await_artifacts.sh ${{ inputs.name }} ${{ inputs.name }}"

- name: Install BTP operator
timeout-minutes: 2
run: "./scripts/testing/install.sh $MODULE_REPO:v${{ inputs.name }} dummy ci"
run: "./scripts/testing/install.sh $MODULE_REPO:${{ inputs.name }} dummy ci"

- name: BTP Manager controller resources usage
run: "kubectl top pod -l app.kubernetes.io/component=btp-manager.kyma-project.io -n kyma-system --containers"
Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:
uses: "./.github/workflows/run-e2e-upgrade-tests-reusable.yaml"
with:
image-tag: ${{ github.event.inputs.name }}
module-tag: v${{ github.event.inputs.name }}
module-tag: ${{ github.event.inputs.name }}
image-repo: europe-docker.pkg.dev/kyma-project/prod/btp-manager
module-repo: europe-docker.pkg.dev/kyma-project/prod/unsigned/component-descriptors/kyma.project.io/module/btp-operator

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promote_to_module-manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
cat <<EOF | tee module-config.yaml
name: ${FULL_MODULE_NAME}
channel: ${CHANNEL}
version: v${TAG}
version: ${TAG}
manifest: ${MANIFEST_FILENAME}
defaultCR: ${DEFAULT_CR_FILENAME}
annotations:
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_and_push_locally.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ IMG_NAME=btp-manager:${PR_NAME}

MODULE_PREFIX=${MODULE_PREFIX:-0.0.0}
MODULE_VERSION=${MODULE_PREFIX}-${PR_NAME}
EXTENDED_MODULE_VERSION=v${MODULE_VERSION}
EXTENDED_MODULE_VERSION=${MODULE_VERSION}
MODULE_NAME=component-descriptors/kyma.project.io/module/btp-operator

echo "Creating binary image and pushing to registry: ${LOCAL_REGISTRY}"
Expand Down
2 changes: 1 addition & 1 deletion scripts/testing/run_e2e_module_upgrade_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ elif [[ $# -eq 2 ]]; then
GITHUB_URL=https://api.github.com/repos/${REPOSITORY}
LATEST_RELEASE=$(curl -sS "${GITHUB_URL}/releases/latest" | jq -r '.tag_name')
NEW_MODULE_IMAGE_NAME=$1
OLD_MODULE_IMAGE_NAME=${NEW_MODULE_IMAGE_NAME/:*/:v$LATEST_RELEASE}
OLD_MODULE_IMAGE_NAME=${NEW_MODULE_IMAGE_NAME/:*/:$LATEST_RELEASE}
CI=${2-manual} # if called from any workflow "ci" is expected here
else
echo "wrong number of arguments" && exit 1
Expand Down