Fix prod build on release, improve int build on push

Author: Kagemaru

.github/workflows/build-int-on-push.yaml

@@ -4,30 +4,35 @@ on:
   workflow_dispatch:
     inputs:
       image_repo:
-        description: "Image repo"
+        description: 'Image repo'
         type: string
-        required: true
+        required: false
+        default: 'https://harbor.puzzle.ch'
       image_url:
-        description: "URL to push image to"
+        description: 'URL to push image to'
         type: string
-        required: true
+        required: false
+        default: 'harbor.puzzle.ch/decidim/stzh-int-rails'
       configmanagement:
-        description: "Configmanagement to write image tag to"
+        description: 'Configmanagement to write image tag to'
         type: string
-        required: true
+        required: false
+        default: 'gitlab.puzzle.ch/pitc_ruby/deployments/decidim/'
       configmanagement_branch:
-        description: "Configmanagement branch to put the image tag into"
+        description: 'Configmanagement branch to put the image tag into'
         type: string
         required: false
+        default: 'main'
       kustomization_path:
-        description: "Path to kustomization file"
+        description: 'Path to kustomization file'
         type: string
         required: true
+        default: './deployments/pitc-decidim-stzh-int/kustomization.yaml'
       identifier:
         description: 'Identifier for commit-message, could be a namespace or project-name'
         type: string
         required: false
-        default: 'deployment'
+        default: 'stzh-int'
 
   push:
     branches:
@@ -41,16 +46,10 @@ jobs:
   build-image:
     uses: ./.github/workflows/reusable_lint_test_build_update.yaml
     with:
-      # repository: gitlab.puzzle.ch/pitc_ruby/deployments/decidim.git
-      # file: ./deployments/${{ needs.settings.outputs.namespace_name }}/kustomization.yaml
-      # image_tag: ${{ needs.version.outputs.version }}
-      # image_ref: rails
-      # identifier: ${{ needs.settings.outputs.namespace_name }}
-
-      image_repo: "https://harbor.puzzle.ch"
-      image_url: "harbor.puzzle.ch/decidim/stzh-int-rails"
-      configmanagement: "gitlab.puzzle.ch/pitc_ruby/deployments/decidim/"
-      configmanagement_branch: "main"
-      kustomization_path: "./deployments/pitc-decidim-stzh-int/kustomization.yaml"
-      identifier: "stzh-int"
+      image_repo: ${{ inputs.image_repo }}
+      image_url: ${{ inputs.image_url }}
+      configmanagement: ${{ inputs.configmanagement }}
+      configmanagement_branch: ${{ inputs.configmanagement_branch }}
+      kustomization_path: ${{ inputs.kustomization_path }}
+      identifier: ${{ inputs.identifier }}
     secrets: inherit

.github/workflows/build-prod-on-release.yaml

@@ -9,10 +9,13 @@ on:
     branches:
       - master
 jobs:
-  build_image:
-    uses: ./.github/workflows/lint_test_build_update.yaml
-    secrets: inherit
+  build-image:
+    uses: ./.github/workflows/reusable_lint_test_build_update.yaml
     with:
-      image_repo: "harbor.puzzle.ch/decidim/stzh/prod/rails"
+      image_repo: "https://harbor.puzzle.ch"
+      image_url: "harbor.puzzle.ch/decidim/stzh-prod-rails"
       configmanagement: "gitlab.puzzle.ch/pitc_ruby/deployments/decidim/"
-      kustomization_path: "./deployments/pitc-stzh-decidim-prod/kustomization.yaml"
+      configmanagement_branch: "main"
+      kustomization_path: "./deployments/pitc-decidim-stzh-prod/kustomization.yaml"
+      identifier: "stzh-prod"
+    secrets: inherit