1
0
Fork 0
mirror of https://github.com/JasonN3/build-container-installer.git synced 2025-12-25 10:57:55 +01:00

rhel specific items

This commit is contained in:
Jason N. 2024-03-20 10:40:31 -04:00
parent 05fd98f1ef
commit 3f560ceebe
2 changed files with 5 additions and 0 deletions

View file

@ -141,6 +141,7 @@ jobs:
enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }} enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
iso_name: ${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso iso_name: ${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso
secrets_dir: ${{ matrix.rhel && '/github/workspace/ubi' || '' }} secrets_dir: ${{ matrix.rhel && '/github/workspace/ubi' || '' }}
repos: ${{ matrix.rhel && '/etc/yum.repos.d/redhat.repo' || '/etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo' }}
- name: Save output - name: Save output
id: save_output id: save_output

View file

@ -150,7 +150,11 @@ build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.tx
external/lorax/branch-$(VERSION): external/lorax/branch-$(VERSION):
git config advice.detachedHead false git config advice.detachedHead false
ifeq ($(_RHEL),true)
cd external/lorax && git reset --hard HEAD && git checkout origin/rhel$(VERSION)-branch
else
cd external/lorax && git reset --hard HEAD && git checkout tags/$(shell cd external/lorax && git tag -l lorax-$(VERSION).* --sort=creatordate | tail -n 1) cd external/lorax && git reset --hard HEAD && git checkout tags/$(shell cd external/lorax && git tag -l lorax-$(VERSION).* --sort=creatordate | tail -n 1)
endif
touch external/lorax/branch-$(VERSION) touch external/lorax/branch-$(VERSION)
# Step 1: Generate Lorax Templates # Step 1: Generate Lorax Templates