diff --git a/.gitignore b/.gitignore index c842193..3584969 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ /**/ansible/inventories/test/ /bin /images +/images.txt /tmp packer/*.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef82037..f45b116 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,10 +75,10 @@ security_scanner: - docker:dind script: - scripts/packer.sh debian-buster - - aws --endpoint-url "$AWS_ENDPOINT_URL" s3 cp images/ "s3://$AWS_BUCKET/$CI_COMMIT_REF_SLUG/$CI_JOB_ID/" --recursive + - aws --endpoint-url "$AWS_ENDPOINT_URL" s3 cp images/ "s3://$AWS_BUCKET/$CI_COMMIT_REF_SLUG/$CI_JOB_ID/" --recursive --no-progress artifacts: paths: - - images/*.initramfs + - images.txt - images/*.dpkg-list - images/*.initramfs - images/*.linux diff --git a/scripts/packer.sh b/scripts/packer.sh index 432633d..a8a5975 100755 --- a/scripts/packer.sh +++ b/scripts/packer.sh @@ -1,12 +1,17 @@ #!/bin/sh +set -e set -o nounset export NAME="$1" mkdir -p images export IMAGES="$(realpath images)" -cd packer +( + cd packer -python3 -c 'import sys, yaml, json; json.dump(yaml.safe_load(sys.stdin), sys.stdout, indent=4)' < "$NAME.yaml" > "$NAME.json" + python3 -c 'import sys, yaml, json; json.dump(yaml.safe_load(sys.stdin), sys.stdout, indent=4)' < "$NAME.yaml" > "$NAME.json" -packer build "$NAME.json" + packer build "$NAME.json" +) + +echo "$NAME" >> images.txt