diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2021-10-21 13:16:51 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2021-10-21 13:16:51 +0200 |
| commit | e3e224ecf22d3747a7373fd6b4873b74709957c0 (patch) | |
| tree | e318a44e10aaafe98b8b0232a77d0fbccf3ddf76 | |
| parent | 501f2f37a2d2cc9d0607de8fbbaa416d7c278ac2 (diff) | |
| download | imagefish-e3e224ecf22d3747a7373fd6b4873b74709957c0.tar.gz | |
tweak ci
| -rw-r--r-- | .gitlab-ci.yml | 18 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/virt-builder-prepare.sh | 7 |
2 files changed, 16 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87f37c6..5f54951 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,16 +11,16 @@ variables: - mkdir $CI_JOB_NAME - for image in *.qcow2; do - test -f "$image" || continue - virt-sysprep -a "$image"; - virt-sparsify --inplace "$image"; - info=${image%.qcow2}.info; - qemu-img info --output=json $image > $info; - mv --verbose $info $CI_JOB_NAME; + test -f "$image" || continue; + scripts/virt-builder-prepare.sh "$image"; + mv --verbose ${image%.qcow2}* $CI_JOB_NAME; + done + - for tar in *.tar; + do + test -f "$tar" || continue; + xz --verbose "$tar"; + mv --verbose ${tar}* $CI_JOB_NAME; done - - xz --verbose $(ls *.tar *.qcow2) - - mv --verbose *.xz $CI_JOB_NAME - - (cd $CI_JOB_NAME; for info in *.info; do test -f "$info" || continue; ../scripts/virt-builder-index.sh $info; done) - name="$CI_JOB_NAME images" - base="$CI_JOB_URL/artifacts/raw/$CI_JOB_NAME" - tree -i -f -s -h -D --charset utf8 -T "$name" -H "$base" $CI_JOB_NAME > index.html diff --git a/scripts/virt-builder-prepare.sh b/scripts/virt-builder-prepare.sh index 6212cfa..47f60fa 100644..100755 --- a/scripts/virt-builder-prepare.sh +++ b/scripts/virt-builder-prepare.sh @@ -10,7 +10,14 @@ image="$1" scripts="$(dirname $0)" info="${image%.qcow2}.info" +# checks +if test ! -f "$1"; then + echo "usage: $0 <image>" + exit 1 +fi + # go! +set -ex virt-sysprep -a "$image" virt-sparsify --inplace "$image" qemu-img info --output=json "$image" > "$info" |