chore: reuse component builds for aggregation

open-component-model · Nov 4, 2024 · 11c700e · 11c700e
1 parent b620c9c
commit 11c700e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/components.yaml b/.github/workflows/components.yaml
@@ -19,8 +19,7 @@ jobs:
     name: "Build"
     strategy:
       matrix:
-        component: [ocmcli]
-#        component: [ocmcli, helminstaller, helmdemo, subchartsdemo, ecrplugin]
+        component: [ocmcli, helminstaller, helmdemo, subchartsdemo, ecrplugin]
     runs-on: large_runner
     steps:
       - name: Self Hosted Runner Post Job Cleanup Action
@@ -70,8 +69,7 @@ jobs:
     runs-on: large_runner
     needs: build
     env:
-      components: ocmcli
-#      components: ocmcli helminstaller helmdemo subchartsdemo ecrplugin
+      components: ocmcli helminstaller helmdemo subchartsdemo ecrplugin
     steps:
       - name: Self Hosted Runner Post Job Cleanup Action
         uses: TooMuch4U/[email protected]
@@ -125,7 +123,7 @@ jobs:
         with:
           if-no-files-found: error
           overwrite: true
-          retention-days: 1
+          retention-days: 90
           name: ctf-aggregated
           path: gen/ctf
       - name: Delete old CTFs that lead up to aggregation

diff --git a/components/demoplugin/Makefile b/components/demoplugin/Makefile
@@ -105,7 +105,7 @@ info:
 
 .PHONY: describe
 describe: $(GEN)/ctf $(OCM_BIN)
-	$(OCM) get resources --lookup $(OCMREPO) -c -o treewide $(GEN)/ctf
+	$(OCM) get resources --lookup $(OCMREPO) -r -o treewide $(GEN)/ctf
 
 .PHONY: descriptor
 descriptor: $(GEN)/ctf $(OCM_BIN)

diff --git a/components/ecrplugin/Makefile b/components/ecrplugin/Makefile
@@ -107,7 +107,7 @@ info:
 
 .PHONY: describe
 describe: $(GEN)/ctf $(OCM_BIN)
-	$(OCM) get resources --lookup $(OCMREPO) -c -o treewide $(GEN)/ctf
+	$(OCM) get resources --lookup $(OCMREPO) -r -o treewide $(GEN)/ctf
 
 .PHONY: descriptor
 descriptor: $(GEN)/ctf $(OCM_BIN)

diff --git a/components/subchartsdemo/Makefile b/components/subchartsdemo/Makefile
@@ -77,12 +77,12 @@ info:
 	@echo "CREDS:    $(CREDS)"
 
 .PHONY: describe
-describe: $(GEN)/ctf
-	ocm get resources --lookup $(OCMREPO) -o treewide $(GEN)/ctf
+describe: $(GEN)/ctf $(OCM_BIN)
+	$(OCM) get resources --lookup $(OCMREPO) -r -o treewide $(GEN)/ctf
 
 .PHONY: descriptor
-descriptor: $(GEN)/ctf
-	ocm get component -S v3alpha1 -o yaml $(GEN)/ctf
+descriptor: $(GEN)/ctf $(OCM_BIN)
+	$(OCM) get component -S v3alpha1 -o yaml $(GEN)/ctf
 
 .PHONY: clean
 clean: