Update workflows

Signed-off-by: David Cassany <dcassany@suse.com>
rancher · Apr 21, 2022 · 6a209c8 · 6a209c8
1 parent f21e05c
commit 6a209c8
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 65 deletions.
diff --git a/.github/build.yaml.gomplate b/.github/build.yaml.gomplate
@@ -234,13 +234,11 @@
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-{{{ $flavor }}}-${{ env.COS_VERSION }}-{{{ $config.arch }}}" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-{{{ $flavor }}}-${{ env.COS_VERSION }}-{{{ $config.arch }}} --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-{{{ $flavor }}}-${{ env.COS_VERSION }}-{{{ $config.arch }}}" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-{{{ $flavor }}}-${{ env.COS_VERSION }}-{{{ $config.arch }}}" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-{{{$subset}}}-{{{ $flavor }}}-{{{ $config.arch }}}.iso.zip

diff --git a/.github/helpers.sh b/.github/helpers.sh
@@ -23,5 +23,5 @@ create_remote_manifest() {
 
 drop_recovery() {
     MANIFEST=$1
-    $YQ e -i 'del( .packages.isoimage[] | select(.=="recovery/cos-img") )' $MANIFEST 
-}
+    $YQ e -i 'del( .iso.image[] | select(.=="recovery/cos-img") )' $MANIFEST 
+}
diff --git a/.github/workflows/build-master-green-arm64.yaml b/.github/workflows/build-master-green-arm64.yaml
@@ -154,13 +154,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-arm64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-arm64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-arm64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-arm64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-squashfs-green-arm64.iso.zip
@@ -324,13 +322,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-arm64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-arm64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-arm64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-arm64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-nonsquashfs-green-arm64.iso.zip

diff --git a/.github/workflows/build-master-green-x86_64.yaml b/.github/workflows/build-master-green-x86_64.yaml
@@ -152,13 +152,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-squashfs-green-x86_64.iso.zip
@@ -435,13 +433,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-nonsquashfs-green-x86_64.iso.zip

diff --git a/.github/workflows/build-nightly-green-x86_64.yaml b/.github/workflows/build-nightly-green-x86_64.yaml
@@ -129,13 +129,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-squashfs-green-x86_64.iso.zip
@@ -406,13 +404,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-nonsquashfs-green-x86_64.iso.zip

diff --git a/.github/workflows/build-pr-green-arm64.yaml b/.github/workflows/build-pr-green-arm64.yaml
@@ -140,13 +140,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-arm64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-arm64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-arm64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-arm64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-squashfs-green-arm64.iso.zip
@@ -310,13 +308,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-arm64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-arm64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-arm64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-arm64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-nonsquashfs-green-arm64.iso.zip

diff --git a/.github/workflows/build-pr-green-x86_64.yaml b/.github/workflows/build-pr-green-x86_64.yaml
@@ -143,13 +143,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-squashfs-green-x86_64.iso.zip
@@ -426,13 +424,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-nonsquashfs-green-x86_64.iso.zip

diff --git a/.github/workflows/build-releases-green-arm64.yaml b/.github/workflows/build-releases-green-arm64.yaml
@@ -154,13 +154,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-arm64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-arm64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-arm64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-arm64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-squashfs-green-arm64.iso.zip
@@ -324,13 +322,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-arm64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-arm64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-arm64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-arm64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-nonsquashfs-green-arm64.iso.zip

diff --git a/.github/workflows/build-releases-green-x86_64.yaml b/.github/workflows/build-releases-green-x86_64.yaml
@@ -152,13 +152,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-squashfs-green-x86_64.iso.zip
@@ -435,13 +433,11 @@ jobs:
       - name: Build ISO from local build 🔧
         if: github.event_name != 'schedule' && !startsWith(github.ref, 'refs/tags/')
         run: |
-          source .github/helpers.sh
-          create_remote_manifest manifest.yaml
-          sudo -E MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" MANIFEST=manifest.yaml.remote make local-iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64 --repo ${{ env.FINAL_REPO }}" make local-iso
       - name: Build ISO from remote repositories 🔧
         if: github.event_name == 'schedule' || startsWith(github.ref, 'refs/tags/')
         run: |
-          sudo -E YQ=/usr/bin/yq MAKEISO_ARGS="--output cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
+          sudo -E MAKEISO_ARGS="--name cOS-Seed-green-${{ env.COS_VERSION }}-x86_64" make iso
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-nonsquashfs-green-x86_64.iso.zip

diff --git a/make/Makefile.iso b/make/Makefile.iso
@@ -78,7 +78,7 @@ endif
 ifneq ("$(ISO)","")
 	@echo "'$(ISO) exists, run 'make clean_iso' folled by 'make $@' to recreate"
 else
-	$(ELEMENTAL) --debug --config-dir . build-iso --repo $(DESTINATION)
+	$(ELEMENTAL) --debug --config-dir $(ROOT_DIR) build-iso $(MAKEISO_ARGS) --date --repo $(DESTINATION)
 endif
 
 .PHONY: iso
@@ -90,7 +90,7 @@ endif
 ifneq ("$(ISO)","")
 	@echo "'$(ISO) exists, run 'make clean_iso' folled by 'make $@' to recreate"
 else
-	$(ELEMENTAL) --debug --config-dir . build-iso --repo $(FINAL_REPO)
+	$(ELEMENTAL) --debug --config-dir $(ROOT_DIR) build-iso $(MAKEISO_ARGS) --repo $(FINAL_REPO)
 endif
 
 

diff --git a/manifest.yaml b/manifest.yaml
@@ -10,7 +10,6 @@ iso:
   label: "COS_LIVE"
 
 name: "cOS-0"
-date: true
 label: "COS_LIVE"
 
 # Raw disk creation values start