particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add temporary workaround for CLOUDX-488

Browse source 
https://redhat-internal.slack.com/archives/C0235DZB0DT/p1686812091343739
This commit is contained in:
Alexander Todorov 2023-06-15 12:01:32 +03:00 • committed by Ondřej Budai
parent f5965a98da
commit b6cd24e3c0
2 changed files with 37 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

30
test/cases/aws.sh
View file

@ -255,19 +255,25 @@ fi
cp "${CIV_CONFIG_FILE}" "${TEMPDIR}/civ_config.yml" cp "${CIV_CONFIG_FILE}" "${TEMPDIR}/civ_config.yml"
sudo "${CONTAINER_RUNTIME}" run \ # temporary workaround for
-a stdout -a stderr \ # https://issues.redhat.com/browse/CLOUDX-488
-e AWS_ACCESS_KEY_ID="${V2_AWS_ACCESS_KEY_ID}" \ if nvrGreaterOrEqual "osbuild-composer" "83"; then
-e AWS_SECRET_ACCESS_KEY="${V2_AWS_SECRET_ACCESS_KEY}" \ sudo "${CONTAINER_RUNTIME}" run \
-e AWS_REGION="${AWS_REGION}" \ -a stdout -a stderr \
-e JIRA_PAT="${JIRA_PAT}" \ -e AWS_ACCESS_KEY_ID="${V2_AWS_ACCESS_KEY_ID}" \
-v "${TEMPDIR}":/tmp:Z \ -e AWS_SECRET_ACCESS_KEY="${V2_AWS_SECRET_ACCESS_KEY}" \
"${CONTAINER_CLOUD_IMAGE_VAL}" \ -e AWS_REGION="${AWS_REGION}" \
python cloud-image-val.py \ -e JIRA_PAT="${JIRA_PAT}" \
-c /tmp/civ_config.yml \ -v "${TEMPDIR}":/tmp:Z \
&& RESULTS=1 || RESULTS=0 "${CONTAINER_CLOUD_IMAGE_VAL}" \
python cloud-image-val.py \
-c /tmp/civ_config.yml \
&& RESULTS=1 || RESULTS=0
mv "${TEMPDIR}"/report.html "${ARTIFACTS}" mv "${TEMPDIR}"/report.html "${ARTIFACTS}"
else
RESULTS=1
fi
# Clean up our mess. # Clean up our mess.
greenprint "🧼 Cleaning up" greenprint "🧼 Cleaning up"

32
test/cases/azure.sh
View file

@ -232,20 +232,26 @@ fi
cp "${CIV_CONFIG_FILE}" "${TEMPDIR}/civ_config.yml" cp "${CIV_CONFIG_FILE}" "${TEMPDIR}/civ_config.yml"
sudo "${CONTAINER_RUNTIME}" run \ # temporary workaround for
-a stdout -a stderr \ # https://issues.redhat.com/browse/CLOUDX-488
-e ARM_CLIENT_ID="${V2_AZURE_CLIENT_ID}" \ if nvrGreaterOrEqual "osbuild-composer" "83"; then
-e ARM_CLIENT_SECRET="${V2_AZURE_CLIENT_SECRET}" \ sudo "${CONTAINER_RUNTIME}" run \
-e ARM_SUBSCRIPTION_ID="${AZURE_SUBSCRIPTION_ID}" \ -a stdout -a stderr \
-e ARM_TENANT_ID="${AZURE_TENANT_ID}" \ -e ARM_CLIENT_ID="${V2_AZURE_CLIENT_ID}" \
-e JIRA_PAT="${JIRA_PAT}" \ -e ARM_CLIENT_SECRET="${V2_AZURE_CLIENT_SECRET}" \
-v "${TEMPDIR}":/tmp:Z \ -e ARM_SUBSCRIPTION_ID="${AZURE_SUBSCRIPTION_ID}" \
"${CONTAINER_CLOUD_IMAGE_VAL}" \ -e ARM_TENANT_ID="${AZURE_TENANT_ID}" \
python cloud-image-val.py \ -e JIRA_PAT="${JIRA_PAT}" \
-c /tmp/civ_config.yml \ -v "${TEMPDIR}":/tmp:Z \
&& RESULTS=1 || RESULTS=0 "${CONTAINER_CLOUD_IMAGE_VAL}" \
python cloud-image-val.py \
-c /tmp/civ_config.yml \
&& RESULTS=1 || RESULTS=0
mv "${TEMPDIR}"/report.html "${ARTIFACTS}" mv "${TEMPDIR}"/report.html "${ARTIFACTS}"
else
RESULTS=1
fi
# Also delete the compose so we don't run out of disk space # Also delete the compose so we don't run out of disk space
sudo composer-cli compose delete "${COMPOSE_ID}" > /dev/null sudo composer-cli compose delete "${COMPOSE_ID}" > /dev/null