Skip to content

feat(RELEASE-2476): convert collect-charon-params task to Python #2341

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

Draft
querti wants to merge 1 commit into
base: development
Choose a base branch
from
+25 −263
Draft

feat(RELEASE-2476): convert collect-charon-params task to Python #2341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 23 additions & 48 deletions tasks/managed/collect-charon-params/collect-charon-params.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,57 +127,32 @@ spec:
- name: sourceDataArtifact
value: $(params.sourceDataArtifact)
- name: collect-charon-params
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
image: quay.io/lgallovi-test/release-service-utils@sha256:d3c28f245cd0ade0ce825c17c6986f14153cc49043fd168f5ced30bbdaba52e2
computeResources:
limits:
memory: 128Mi
memory: 192Mi
requests:
memory: 128Mi
cpu: 50m
script: |
#!/usr/bin/env bash
set -eux

WORK_DIR=$(params.dataDir)
cd "$WORK_DIR"

DATA_FILE="$WORK_DIR/$(params.dataJsonPath)"
CHARON_ENV_FILE_PATH="$(dirname "$(params.dataJsonPath)")/charon.env"

environment="$(jq -re '.charon.environment' "$DATA_FILE")"
release="$(jq -re '.charon.release' "$DATA_FILE")"
packageType="$(jq -re '.charon.packageType // "maven"' "$DATA_FILE")"
target="$environment-$packageType-$release"
echo "export CHARON_TARGET=$target" >> "$CHARON_ENV_FILE_PATH"

productName="$(jq -re '.releaseNotes.product_name' "$DATA_FILE")"
productVersion="$(jq -re '.releaseNotes.product_version' "$DATA_FILE")"
echo "export CHARON_PRODUCT_NAME=\"$productName\"" >> "$CHARON_ENV_FILE_PATH"
echo "export CHARON_PRODUCT_VERSION=\"$productVersion\"" >> "$CHARON_ENV_FILE_PATH"

sign_key="$(jq -re '.charon.signing.signKey // ""' "$DATA_FILE")"
if [ "$sign_key" != "" ]; then
echo "export CHARON_SIGN_KEY=\"$sign_key\"" >> "$CHARON_ENV_FILE_PATH"
fi

SNAPSHOT_PATH="$WORK_DIR/$(params.snapshotPath)"
ociRegistries="$(jq -re '[.components[].containerImage] | join("%")' "$SNAPSHOT_PATH")"
echo "export CHARON_OCI_REGISTRY=\"$ociRegistries\"" >> "$CHARON_ENV_FILE_PATH"

awsSecret="$(jq -re '.charon.awsSecret' "$DATA_FILE")"
echo -n "$awsSecret" > "$(results.charonAWSSecret.path)"

sign_ca_secret="$(jq -re '.charon.signing.signCASecret // ""' "$DATA_FILE")"
echo -n "$sign_ca_secret" > "$(results.charonSignCASecret.path)"

AUTHOR=$(jq -re '.status.attribution.author' "$WORK_DIR/$(params.releasePath)")
echo "export CHARON_AUTHOR=\"$AUTHOR\"" >> "$CHARON_ENV_FILE_PATH"

echo -n "$CHARON_ENV_FILE_PATH" > "$(results.charonParamFilePath.path)"

CHARON_CFG_FILE_PATH="$(dirname "$(params.dataJsonPath)")/charon-config.yaml"
jq -re '.charon.config' "$DATA_FILE" > "$CHARON_CFG_FILE_PATH"
echo -n "$CHARON_CFG_FILE_PATH" > "$(results.charonConfigFilePath.path)"
memory: 192Mi
cpu: 100m
command: ["/home/scripts/python/tasks/managed/collect_charon_params.py"]
args:
- "--work-dir"
- "$(params.dataDir)"
- "--data-json-path"
- "$(params.dataJsonPath)"
- "--snapshot-path"
- "$(params.snapshotPath)"
- "--release-path"
- "$(params.releasePath)"
env:
- name: RESULT_CHARON_PARAM_FILE_PATH
value: $(results.charonParamFilePath.path)
- name: RESULT_CHARON_CONFIG_FILE_PATH
value: $(results.charonConfigFilePath.path)
- name: RESULT_CHARON_AWS_SECRET
value: $(results.charonAWSSecret.path)
- name: RESULT_CHARON_SIGN_CA_SECRET
value: $(results.charonSignCASecret.path)
- name: create-trusted-artifact
computeResources:
limits:
Expand Down
105 changes: 0 additions & 105 deletions tasks/managed/collect-charon-params/tests/test-collect-charon-params-fail-no-data.yaml
View file
Open in desktop

This file was deleted.

108 changes: 0 additions & 108 deletions tasks/managed/collect-charon-params/tests/test-collect-charon-params-fail-no-snapshot.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions tasks/managed/collect-charon-params/tests/test-collect-charon-params.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
value: "$(params.trustedArtifactsDebug)"
steps:
- name: setup-values
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
image: quay.io/lgallovi-test/release-service-utils@sha256:d3c28f245cd0ade0ce825c17c6986f14153cc49043fd168f5ced30bbdaba52e2
script: |
#!/usr/bin/env sh
set -eux
Expand Down Expand Up @@ -182,7 +182,7 @@ spec:
- name: sourceDataArtifact
value: $(params.sourceDataArtifact)
- name: check-result
image: quay.io/konflux-ci/release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
image: quay.io/lgallovi-test/release-service-utils@sha256:d3c28f245cd0ade0ce825c17c6986f14153cc49043fd168f5ced30bbdaba52e2
script: |
#!/usr/bin/env bash
set -eux
Expand Down
Loading