From b53e4c3c22bd5334bf66b9ce28ab56a5b31b4495 Mon Sep 17 00:00:00 2001 From: greg pereira Date: Mon, 6 May 2024 10:07:24 -0700 Subject: [PATCH] adding ISOs dir and updating workflow Signed-off-by: greg pereira --- .github/workflows/iso_builder_test.yaml | 12 +++++++----- .gitignore | 1 + training/iso-builder/ISOs/.gitkeep | 0 training/iso-builder/Makefile | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 training/iso-builder/ISOs/.gitkeep diff --git a/.github/workflows/iso_builder_test.yaml b/.github/workflows/iso_builder_test.yaml index f5e24c3e3..165e17e5c 100644 --- a/.github/workflows/iso_builder_test.yaml +++ b/.github/workflows/iso_builder_test.yaml @@ -61,6 +61,7 @@ jobs: echo "sshpubkey=$(cat id_rsa.pub | xargs)" >> $GITHUB_OUTPUT - name: Download the ISO + working-directory: ./training/iso-builder/ run: | make centos-iso-download @@ -72,18 +73,19 @@ jobs: echo "embedded_image=$(echo '${{ matrix.parent_image_registry }}/${{ matrix.parent_image_org }}/${{ matrix.parent_image_name }}:${{ matrix.parent_image_tag }}' | xargs)" >> $GITHUB_OUTPUT echo "produced_image=$(echo '${{env.REGISTRY}}/${{env.REGISTRY_ORG}}/${{ matrix.iso_image_name }}:${{ matrix.parent_image_tag }}' | xargs)" >> $GITHUB_OUTPUT + - name: Run the Image + working-directory: ./training/iso-builder/ + run: | + make iso IMAGE=${{ steps.build_image.outputs.produced_image }} EMBED_IMAGE=${{ steps.build_image.outputs.embedded_image }} ORIGINAL_ISO="ISOs/${{ matrix.iso_name }}" SSHKEY="${{ steps.ssh-keygen.outputs.sshpubkey }}" CONTAINER_TOOL_EXTRA_ARGS=--pull=never + - name: Setup tmate session + if: ${{ failure() }} uses: mxschmitt/action-tmate@v3.18 timeout-minutes: 10 with: detached: false limit-access-to-actor: true - - name: Run the Image - working-directory: ./training/iso-builder/ - run: | - make iso IMAGE=${{ steps.build_image.outputs.produced_image }} EMBED_IMAGE=${{ steps.build_image.outputs.embedded_image }} ORIGINAL_ISO=ISOs/${{ matrix.iso_name }} SSHKEY=${{ steps.ssh-keygen.outputs.sshpubkey }} CONTAINER_TOOL_EXTRA_ARGS=--pull=never - # - name: Publish Job Results to Slack # id: slack # if: always() diff --git a/.gitignore b/.gitignore index 5aa38728a..f4080f98c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ recipes/common/bin/* training/cloud/examples training/instructlab/instructlab training/iso-builder/ISOs/* +!training/iso-builder/ISOs/.gitkeep diff --git a/training/iso-builder/ISOs/.gitkeep b/training/iso-builder/ISOs/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/training/iso-builder/Makefile b/training/iso-builder/Makefile index a644e609b..ba533cbd6 100644 --- a/training/iso-builder/Makefile +++ b/training/iso-builder/Makefile @@ -42,7 +42,7 @@ iso: "${CONTAINER_TOOL}" run \ --rm \ - --volume $(shell readlink -f ISOs/${ORIGINAL_ISO}):/root/original.iso:ro \ + --volume $(shell readlink -f ${ORIGINAL_ISO}):/root/original.iso:ro \ --volume ${OUTPUT_DIR}:/output \ --volume $(shell ${CONTAINER_TOOL} system info --format json | jq -r '.store.graphRoot'):/var/lib/containers/storage \ "${REGISTRY}/${REGISTRY_ORG}/${IMAGE_NAME}:${IMAGE_TAG}" \