ci: Minor pipeline adjustments (#156)

Co-authored-by: Moritz Wiesinger <[email protected]>
keptn · Oct 13, 2022 · 1639009 · 1639009
1 parent d183e4f
commit 1639009
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -176,14 +176,18 @@ jobs:
 
     - name: Build Docker Images
       working-directory: ./${{ matrix.config.working-dir }}
+      env:
+        TAG: dev-${{ env.DATETIME }}
       run: |
-        make release-image TAG=dev-${{ env.DATETIME }}
+        make release-image
 
     - name: Push Docker Images
       if: ( github.actor != 'renovate[bot]' && github.actor != 'dependabot[bot]' ) && ( github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository )
       working-directory: ./${{ matrix.config.working-dir }}
+      env:
+        TAG: dev-${{ env.DATETIME }}
       run: |
-        make push-release-images TAG=dev-${{ env.DATETIME }}
+        make push-release-images
 
     - name: Install controller-gen
       if: matrix.config.artifact == 'keptn-lifecycle-operator' && ( github.actor != 'renovate[bot]' && github.actor != 'dependabot[bot]' ) && ( github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository )
@@ -193,7 +197,9 @@ jobs:
     - name: Generate release.yaml
       if: matrix.config.artifact != 'functions-runtime' && ( github.actor != 'renovate[bot]' && github.actor != 'dependabot[bot]' ) && ( github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository )
       working-directory: ./${{ matrix.config.working-dir }}
-      run: make release-manifests TAG=dev-${{ env.DATETIME }}
+      env:
+        TAG: dev-${{ env.DATETIME }}
+      run: make release-manifests
 
     - name: Upload release.yaml
       if: matrix.config.artifact != 'functions-runtime' && ( github.actor != 'renovate[bot]' && github.actor != 'dependabot[bot]' ) && ( github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository )

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -56,17 +56,19 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create images and manifests
+        env:
+          TAG: ${{ needs.release-please.outputs.tag_name }}
         run: |
           cd functions-runtime
-          make build-and-push-image TAG=${{ needs.release-please.outputs.tag_name }}
+          make build-and-push-image
           cd ../scheduler
           go mod tidy
-          make build-and-push-image TAG=${{ needs.release-please.outputs.tag_name }}
-          make release-manifests TAG=${{ needs.release-please.outputs.tag_name }}
+          make build-and-push-image
+          make release-manifests
           cd ../operator
           go mod tidy
-          make build-and-push-image TAG=${{ needs.release-please.outputs.tag_name }}
-          make controller-gen release-manifests TAG=${{ needs.release-please.outputs.tag_name }}
+          make build-and-push-image
+          make controller-gen release-manifests
           cd ..
           echo "---" >> operator/config/rendered/release.yaml
           cat operator/config/rendered/release.yaml scheduler/config/rendered/release.yaml > manifest.yaml

diff --git a/functions-runtime/Makefile b/functions-runtime/Makefile
@@ -31,7 +31,6 @@ release-image.arm64v8: clean
 
 .PHONY: push-release-images
 push-release-images:
-	#gcloud auth configure-docker
 	for arch in $(ARCHS); do \
 		docker push $(RELEASE_REGISTRY)/$(RELEASE_IMAGE)-$${arch} ;\
 	done