cloud-cleaner: clean up image and vm after GCP integration test
Extend internal GCP library to allow deleting Compute Node image and instance. In addition provide function to load service account credentials file content from the environment. Change names used for GCP image and instance in `api.sh` integration test to make them predictable. This is important, so that cloud-cleaner can identify potentially left over resources and clean them up. Use the same approach for generating predictable, but run-specific, test ID as in GenerateCIArtifactName() from internal/test/helpers.go. Use SHA224 to generate a hash from the string, because it can contain characters not allowed by GCP for resource name (specifically "_" e.g. in "x86_64"). SHA-224 was picked because it generates short enough output and it is future proof for use in RHEL (unlike MD5 or SHA-1). Refactor cloud-cleaner to clean up GCP resources and also to run cleanup for each cloud in a separate goroutine. Modify run_cloud_cleaner.sh to be able to run in environment in which AZURE_CREDS is not defined. Always run cloud-cleaner after integration tests for rhel8, rhel84 and cs8, which test GCP. Define DISTRO_CODE for each integration testing stage in Jenkinsfile. Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
parent
f9fe699564
commit
aa1d038b59
6 changed files with 220 additions and 31 deletions
|
|
@ -252,6 +252,18 @@ REQUEST_FILE="${WORKDIR}/request.json"
|
|||
ARCH=$(uname -m)
|
||||
SSH_USER=
|
||||
|
||||
# Generate a string, which can be used as a predictable resource name,
|
||||
# especially when running the test in Jenkins where we may need to clean up
|
||||
# resources in case the test unexpectedly fails or is canceled
|
||||
JENKINS_HOME="${JENKINS_HOME:-}"
|
||||
if [[ -n "$JENKINS_HOME" ]]; then
|
||||
# in Jenkins, imitate GenerateCIArtifactName() from internal/test/helpers.go
|
||||
TEST_ID="$DISTRO_CODE-$ARCH-$BRANCH_NAME-$BUILD_ID"
|
||||
else
|
||||
# if not running in Jenkins, generate ID not relying on specific env variables
|
||||
TEST_ID=$(uuidgen);
|
||||
fi
|
||||
|
||||
case $(set +x; . /etc/os-release; echo "$ID-$VERSION_ID") in
|
||||
"rhel-8.4")
|
||||
DISTRO="rhel-84"
|
||||
|
|
@ -315,7 +327,14 @@ EOF
|
|||
}
|
||||
|
||||
function createReqFileGCP() {
|
||||
GCP_IMAGE_NAME="image-$(uuidgen)"
|
||||
# constrains for GCP resource IDs:
|
||||
# - max 62 characters
|
||||
# - must be a match of regex '[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?|[1-9][0-9]{0,19}'
|
||||
#
|
||||
# use sha224sum to get predictable 56 characters long testID without invalid characters
|
||||
GCP_TEST_ID_HASH="$(echo -n "$TEST_ID" | sha224sum - | sed -E 's/([a-z0-9])\s+-/\1/')"
|
||||
|
||||
GCP_IMAGE_NAME="image-$GCP_TEST_ID_HASH"
|
||||
|
||||
cat > "$REQUEST_FILE" << EOF
|
||||
{
|
||||
|
|
@ -577,7 +596,8 @@ function verifyInGCP() {
|
|||
echo "${SSH_USER}:$(cat "$GCP_SSH_KEY".pub)" > "$GCP_SSH_METADATA_FILE"
|
||||
|
||||
# create the instance
|
||||
GCP_INSTANCE_NAME="gcp-instance-$(uuidgen)"
|
||||
# resource ID can have max 62 characters, the $GCP_TEST_ID_HASH contains 56 characters
|
||||
GCP_INSTANCE_NAME="vm-$GCP_TEST_ID_HASH"
|
||||
|
||||
$GCP_CMD compute instances create "$GCP_INSTANCE_NAME" \
|
||||
--zone="$GCP_REGION-a" \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue