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

test/api/aws: Fix cloned image cleanup

Browse source 
The ami id of the cloned image is stored in `AMI_ID_2`.

Also tag the cloned image with `gitlab-ci-test`
This commit is contained in:
Sanne Raymaekers 2022-09-19 15:25:12 +02:00
parent e0ce32922c
commit bfd90cf191
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/cases/api/aws.sh
View file

@ -22,7 +22,7 @@ function cleanup() {
$AWS_CMD ec2 delete-snapshot --snapshot-id "$AWS_SNAPSHOT_ID"
$AWS_CMD ec2 delete-key-pair --key-name "key-for-$AMI_IMAGE_ID"
$AWS_CMD ec2 deregister-image --region "$REGION_2" --image-id "$AMI_2"
$AWS_CMD ec2 deregister-image --region "$REGION_2" --image-id "$AMI_ID_2"
$AWS_CMD ec2 delete-snapshot --region "$REGION_2" --snapshot-id "$SNAPSHOT_ID_2"
fi
}
@ -146,6 +146,12 @@ function verify() {
SNAPSHOT_ID_2=$(jq -r '.Images[].BlockDeviceMappings[].Ebs.SnapshotId' "$WORKDIR/ami2.json")
$AWS_CMD ec2 describe-snapshot-attribute --region "$REGION_2" --snapshot-id "$SNAPSHOT_ID_2" \
--attribute createVolumePermission > "$WORKDIR/snapshot-attributes2.json"
# Tag cloned image and snapshot with "gitlab-ci-test" tag
$AWS_CMD ec2 create-tags --region "$REGION_2" \
--resources "${SNAPSHOT_ID_2}" "${AMI_ID_2}" \
--tags Key=gitlab-ci-test,Value=true
SHARED_ID_2=$(jq -r ".CreateVolumePermissions[] | select(.UserId==\"$AWS_API_TEST_SHARE_ACCOUNT\").UserId" "$WORKDIR/snapshot-attributes2.json")
if [ "$AWS_API_TEST_SHARE_ACCOUNT" != "$SHARED_ID_2" ]; then
echo "EC2 Snapshot wasn't shared with AWS_API_TEST_SHARE_ACCOUNT"