Skip to content

Commit b53e4c3

Browse files
adding ISOs dir and updating workflow
Signed-off-by: greg pereira <[email protected]>
1 parent 5ab7d7a commit b53e4c3

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.github/workflows/iso_builder_test.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
echo "sshpubkey=$(cat id_rsa.pub | xargs)" >> $GITHUB_OUTPUT
6262
6363
- name: Download the ISO
64+
working-directory: ./training/iso-builder/
6465
run: |
6566
make centos-iso-download
6667
@@ -72,18 +73,19 @@ jobs:
7273
echo "embedded_image=$(echo '${{ matrix.parent_image_registry }}/${{ matrix.parent_image_org }}/${{ matrix.parent_image_name }}:${{ matrix.parent_image_tag }}' | xargs)" >> $GITHUB_OUTPUT
7374
echo "produced_image=$(echo '${{env.REGISTRY}}/${{env.REGISTRY_ORG}}/${{ matrix.iso_image_name }}:${{ matrix.parent_image_tag }}' | xargs)" >> $GITHUB_OUTPUT
7475
76+
- name: Run the Image
77+
working-directory: ./training/iso-builder/
78+
run: |
79+
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
80+
7581
- name: Setup tmate session
82+
if: ${{ failure() }}
7683
uses: mxschmitt/[email protected]
7784
timeout-minutes: 10
7885
with:
7986
detached: false
8087
limit-access-to-actor: true
8188

82-
- name: Run the Image
83-
working-directory: ./training/iso-builder/
84-
run: |
85-
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
86-
8789
# - name: Publish Job Results to Slack
8890
# id: slack
8991
# if: always()

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ recipes/common/bin/*
1313
training/cloud/examples
1414
training/instructlab/instructlab
1515
training/iso-builder/ISOs/*
16+
!training/iso-builder/ISOs/.gitkeep

training/iso-builder/ISOs/.gitkeep

Whitespace-only changes.

training/iso-builder/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ iso:
4242

4343
"${CONTAINER_TOOL}" run \
4444
--rm \
45-
--volume $(shell readlink -f ISOs/${ORIGINAL_ISO}):/root/original.iso:ro \
45+
--volume $(shell readlink -f ${ORIGINAL_ISO}):/root/original.iso:ro \
4646
--volume ${OUTPUT_DIR}:/output \
4747
--volume $(shell ${CONTAINER_TOOL} system info --format json | jq -r '.store.graphRoot'):/var/lib/containers/storage \
4848
"${REGISTRY}/${REGISTRY_ORG}/${IMAGE_NAME}:${IMAGE_TAG}" \

0 commit comments

Comments
 (0)