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

Start using CIV config file

Browse source 
This way, all CIV parameters can be provided from a file stored in
gitlab secrets without the need to change the script.
This commit is contained in:
Juan Abia 2023-03-22 14:48:06 +01:00 • committed by jabia99
parent 00de277d3a
commit e3594f7234
2 changed files with 16 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

20
test/cases/aws.sh
View file

@ -202,10 +202,6 @@ if [[ "$CI_PROJECT_NAME" =~ "cloud-image-val" ]]; then
else else
# If not, get prod container # If not, get prod container
TAG="prod" TAG="prod"
CIV_OPTION_R="-r=/tmp/resource-file.json"
CIV_OPTION_D="-d"
CIV_OPTION_O="-o=/tmp/report.xml"
CIV_OPTION_M="-m not pub"
fi fi
CONTAINER_CLOUD_IMAGE_VAL="quay.io/cloudexperience/cloud-image-val:$TAG" CONTAINER_CLOUD_IMAGE_VAL="quay.io/cloudexperience/cloud-image-val:$TAG"
@ -233,8 +229,13 @@ if [ "$ARCH" == "aarch64" ]; then
sed -i s/t3.medium/a1.large/ "${TEMPDIR}/resource-file.json" sed -i s/t3.medium/a1.large/ "${TEMPDIR}/resource-file.json"
fi fi
# The weird sintax with the CIV_OPTION variables is due to problems with bash quoting and if [ -z "$CIV_CONFIG_FILE" ]; then
# having options with whitespaces in them. Please do not spend more hours trying to fix it echo "ERROR: please provide the variable CIV_CONFIG_FILE"
exit 1
fi
cp "${CIV_CONFIG_FILE}" "${TEMPDIR}/civ_config.yml"
sudo "${CONTAINER_RUNTIME}" run \ sudo "${CONTAINER_RUNTIME}" run \
-a stdout -a stderr \ -a stdout -a stderr \
-e AWS_ACCESS_KEY_ID="${V2_AWS_ACCESS_KEY_ID}" \ -e AWS_ACCESS_KEY_ID="${V2_AWS_ACCESS_KEY_ID}" \
@ -243,12 +244,7 @@ sudo "${CONTAINER_RUNTIME}" run \
-v "${TEMPDIR}":/tmp:Z \ -v "${TEMPDIR}":/tmp:Z \
"${CONTAINER_CLOUD_IMAGE_VAL}" \ "${CONTAINER_CLOUD_IMAGE_VAL}" \
python cloud-image-val.py \ python cloud-image-val.py \
${CIV_OPTION_R:+"$CIV_OPTION_R"} \ -c /tmp/civ_config.yml \
${CIV_OPTION_O:+"$CIV_OPTION_O"} \
${CIV_OPTION_T:+"$CIV_OPTION_T"} \
${CIV_OPTION_M:+"$CIV_OPTION_M"} \
${CIV_OPTION_D:+"$CIV_OPTION_D"} \
${CIV_OPTION_S:+"$CIV_OPTION_S"} \
&& RESULTS=1 || RESULTS=0 && RESULTS=1 || RESULTS=0
mv "${TEMPDIR}"/report.html "${ARTIFACTS}" mv "${TEMPDIR}"/report.html "${ARTIFACTS}"

20
test/cases/azure.sh
View file

@ -202,10 +202,6 @@ if [[ "$CI_PROJECT_NAME" =~ "cloud-image-val" ]]; then
else else
# If not, get prod container # If not, get prod container
TAG="prod" TAG="prod"
CIV_OPTION_R="-r=/tmp/resource-file.json"
CIV_OPTION_D="-d"
CIV_OPTION_O="-o=/tmp/report.xml"
CIV_OPTION_M="-m not pub"
fi fi
CONTAINER_CLOUD_IMAGE_VAL="quay.io/cloudexperience/cloud-image-val:$TAG" CONTAINER_CLOUD_IMAGE_VAL="quay.io/cloudexperience/cloud-image-val:$TAG"
@ -229,8 +225,13 @@ tee "${TEMPDIR}/resource-file.json" <<EOF
} }
EOF EOF
# The weird sintax with the CIV_OPTION variables is due to problems with bash quoting and if [ -z "$CIV_CONFIG_FILE" ]; then
# having options with whitespaces in them. Please do not spend more hours trying to fix it echo "ERROR: please provide the variable CIV_CONFIG_FILE"
exit 1
fi
cp "${CIV_CONFIG_FILE}" "${TEMPDIR}/civ_config.yml"
sudo "${CONTAINER_RUNTIME}" run \ sudo "${CONTAINER_RUNTIME}" run \
-a stdout -a stderr \ -a stdout -a stderr \
-e ARM_CLIENT_ID="${V2_AZURE_CLIENT_ID}" \ -e ARM_CLIENT_ID="${V2_AZURE_CLIENT_ID}" \
@ -240,12 +241,7 @@ sudo "${CONTAINER_RUNTIME}" run \
-v "${TEMPDIR}":/tmp:Z \ -v "${TEMPDIR}":/tmp:Z \
"${CONTAINER_CLOUD_IMAGE_VAL}" \ "${CONTAINER_CLOUD_IMAGE_VAL}" \
python cloud-image-val.py \ python cloud-image-val.py \
${CIV_OPTION_R:+"$CIV_OPTION_R"} \ -c /tmp/civ_config.yml \
${CIV_OPTION_O:+"$CIV_OPTION_O"} \
${CIV_OPTION_T:+"$CIV_OPTION_T"} \
${CIV_OPTION_M:+"$CIV_OPTION_M"} \
${CIV_OPTION_D:+"$CIV_OPTION_D"} \
${CIV_OPTION_S:+"$CIV_OPTION_S"} \
&& RESULTS=1 || RESULTS=0 && RESULTS=1 || RESULTS=0
mv "${TEMPDIR}"/report.html "${ARTIFACTS}" mv "${TEMPDIR}"/report.html "${ARTIFACTS}"