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

test: use non-deprecated gitlab CI variables

Browse source 
CI_BUILD_ID was replaced with CI_JOB_ID in gitlab 9+.
This commit is contained in:
Sanne Raymaekers 2023-05-11 22:48:09 +02:00 • committed by Achilleas Koutsou
parent 0335db645b
commit c7d2eaa5f7
10 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/cases/api.sh
View file

@ -291,7 +291,7 @@ TEST_ID="$(uuidgen)"
CI="${CI:-false}" CI="${CI:-false}"
if [[ "$CI" == true ]]; then if [[ "$CI" == true ]]; then
# in CI, imitate GenerateCIArtifactName() from internal/test/helpers.go # in CI, imitate GenerateCIArtifactName() from internal/test/helpers.go
TEST_ID="$DISTRO_CODE-$ARCH-$CI_COMMIT_BRANCH-$CI_BUILD_ID" TEST_ID="$DISTRO_CODE-$ARCH-$CI_COMMIT_BRANCH-$CI_JOB_ID"
fi fi
export TEST_ID export TEST_ID

2
test/cases/aws.sh
View file

@ -42,7 +42,7 @@ trap cleanup EXIT
CI="${CI:-false}" CI="${CI:-false}"
if [[ "$CI" == true ]]; then if [[ "$CI" == true ]]; then
# in CI, imitate GenerateCIArtifactName() from internal/test/helpers.go # in CI, imitate GenerateCIArtifactName() from internal/test/helpers.go
TEST_ID="$DISTRO_CODE-$ARCH-$CI_COMMIT_BRANCH-$CI_BUILD_ID" TEST_ID="$DISTRO_CODE-$ARCH-$CI_COMMIT_BRANCH-$CI_JOB_ID"
else else
# if not running in Jenkins, generate ID not relying on specific env variables # if not running in Jenkins, generate ID not relying on specific env variables
TEST_ID=$(uuidgen); TEST_ID=$(uuidgen);

2
test/cases/aws_s3.sh
View file

@ -33,7 +33,7 @@ trap cleanup EXIT
CI="${CI:-false}" CI="${CI:-false}"
if [[ "$CI" == true ]]; then if [[ "$CI" == true ]]; then
# in CI, imitate GenerateCIArtifactName() from internal/test/helpers.go # in CI, imitate GenerateCIArtifactName() from internal/test/helpers.go
TEST_ID="$DISTRO_CODE-$ARCH-$CI_COMMIT_BRANCH-$CI_BUILD_ID" TEST_ID="$DISTRO_CODE-$ARCH-$CI_COMMIT_BRANCH-$CI_JOB_ID"
else else
# if not running in Jenkins, generate ID not relying on specific env variables # if not running in Jenkins, generate ID not relying on specific env variables
TEST_ID=$(uuidgen); TEST_ID=$(uuidgen);

2
test/cases/azure.sh
View file

@ -14,7 +14,7 @@ source /usr/libexec/osbuild-composer-test/set-env-variables.sh
source /usr/libexec/tests/osbuild-composer/shared_lib.sh source /usr/libexec/tests/osbuild-composer/shared_lib.sh
BRANCH_NAME="${CI_COMMIT_BRANCH:-local}" BRANCH_NAME="${CI_COMMIT_BRANCH:-local}"
BUILD_ID="${CI_BUILD_ID:-$(uuidgen)}" BUILD_ID="${CI_JOB_ID:-$(uuidgen)}"
HYPER_V_GEN="${HYPER_V_GEN:-V1}" HYPER_V_GEN="${HYPER_V_GEN:-V1}"
# Container image used for cloud provider CLI tools # Container image used for cloud provider CLI tools

2
test/cases/container-embedding.sh
View file

@ -45,7 +45,7 @@ get_compose_metadata () {
} }
BRANCH_NAME="${CI_COMMIT_BRANCH:-local}" BRANCH_NAME="${CI_COMMIT_BRANCH:-local}"
BUILD_ID="${CI_BUILD_ID:-$(uuidgen)}" BUILD_ID="${CI_JOB_ID:-$(uuidgen)}"
TEST_ID="$DISTRO_CODE-$ARCH-$BRANCH_NAME-$BUILD_ID" TEST_ID="$DISTRO_CODE-$ARCH-$BRANCH_NAME-$BUILD_ID"
IMAGE_KEY=container-${TEST_ID} IMAGE_KEY=container-${TEST_ID}

2
test/cases/container-upload.sh
View file

@ -51,7 +51,7 @@ if [ "$ID" != "fedora" ]; then
fi fi
BRANCH_NAME="${CI_COMMIT_BRANCH:-local}" BRANCH_NAME="${CI_COMMIT_BRANCH:-local}"
BUILD_ID="${CI_BUILD_ID:-$(uuidgen)}" BUILD_ID="${CI_JOB_ID:-$(uuidgen)}"
TEST_ID="$DISTRO_CODE-$ARCH-$BRANCH_NAME-$BUILD_ID" TEST_ID="$DISTRO_CODE-$ARCH-$BRANCH_NAME-$BUILD_ID"
IMAGE_KEY=container-${TEST_ID} IMAGE_KEY=container-${TEST_ID}

2
test/cases/gcp.sh
View file

@ -56,7 +56,7 @@ trap cleanup EXIT
CI="${CI:-false}" CI="${CI:-false}"
if [[ "$CI" == true ]]; then if [[ "$CI" == true ]]; then
# in CI, imitate GenerateCIArtifactName() from internal/test/helpers.go # in CI, imitate GenerateCIArtifactName() from internal/test/helpers.go
TEST_ID="$DISTRO_CODE-$ARCH-$CI_COMMIT_BRANCH-$CI_BUILD_ID" TEST_ID="$DISTRO_CODE-$ARCH-$CI_COMMIT_BRANCH-$CI_JOB_ID"
else else
# if not running in Jenkins, generate ID not relying on specific env variables # if not running in Jenkins, generate ID not relying on specific env variables
TEST_ID=$(uuidgen); TEST_ID=$(uuidgen);

2
test/cases/generic_s3.sh
View file

@ -34,7 +34,7 @@ trap cleanup EXIT
CI="${CI:-false}" CI="${CI:-false}"
if [[ "$CI" == true ]]; then if [[ "$CI" == true ]]; then
# in CI, imitate GenerateCIArtifactName() from internal/test/helpers.go # in CI, imitate GenerateCIArtifactName() from internal/test/helpers.go
TEST_ID="$DISTRO_CODE-$ARCH-$CI_COMMIT_BRANCH-$CI_BUILD_ID" TEST_ID="$DISTRO_CODE-$ARCH-$CI_COMMIT_BRANCH-$CI_JOB_ID"
else else
# if not running in Jenkins, generate ID not relying on specific env variables # if not running in Jenkins, generate ID not relying on specific env variables
TEST_ID=$(uuidgen); TEST_ID=$(uuidgen);

4
test/cases/image_tests.sh
View file

@ -5,8 +5,8 @@ set -euo pipefail
source /usr/libexec/osbuild-composer-test/set-env-variables.sh source /usr/libexec/osbuild-composer-test/set-env-variables.sh
source /usr/libexec/tests/osbuild-composer/shared_lib.sh source /usr/libexec/tests/osbuild-composer/shared_lib.sh
if [[ -n "$CI_BUILD_ID" ]]; then if [[ -n "$CI_JOB_ID" ]]; then
BUILD_ID="${BUILD_ID:-${CI_BUILD_ID}}" BUILD_ID="${BUILD_ID:-${CI_JOB_ID}}"
else else
BUILD_ID="${BUILD_ID:-$(uuidgen)}" BUILD_ID="${BUILD_ID:-$(uuidgen)}"
fi fi

2
tools/generic_s3_test.sh
View file

@ -52,7 +52,7 @@ trap cleanup EXIT
CI="${CI:-false}" CI="${CI:-false}"
if [[ "$CI" == true ]]; then if [[ "$CI" == true ]]; then
# in CI, imitate GenerateCIArtifactName() from internal/test/helpers.go # in CI, imitate GenerateCIArtifactName() from internal/test/helpers.go
TEST_ID="$DISTRO_CODE-$ARCH-$CI_COMMIT_BRANCH-$CI_BUILD_ID" TEST_ID="$DISTRO_CODE-$ARCH-$CI_COMMIT_BRANCH-$CI_JOB_ID"
else else
# if not running in Jenkins, generate ID not relying on specific env variables # if not running in Jenkins, generate ID not relying on specific env variables
TEST_ID=$(uuidgen); TEST_ID=$(uuidgen);