siistimistä, router pipelien clean

.gitea/workflows/example-main.yml

@@ -3,18 +3,19 @@ on:
   push:
     branches:
       - main
+      - feature/gitops
   workflow_dispatch:
 
 jobs:
   load-config:
-    name: Config load
+    name: Load example-gitea-env.conf to pipeline env
     uses: niko/gitea-ci-library/.gitea/workflows/config-provider.yml@main
     secrets: inherit
     with:
       config_path: .gitea/workflows/example-gitea-env.conf
 
   check-version:
-    name: Latest versio
+    name: Check existing artifact
     needs: [load-config]
     uses: niko/gitea-ci-library/.gitea/workflows/check-version.yml@main
     secrets: inherit
@@ -49,9 +50,19 @@ jobs:
       env_json: ${{ needs.load-config.outputs.env_json }}
       version: ${{ needs.check-version.outputs.version }}
 
+  helm-build-push:
+    name: Build & Push Helm
+    needs: [load-config, check-version, bats, cucumber]
+    if: needs.check-version.outputs.artifact_exists != 'true'
+    uses: niko/gitea-ci-library/.gitea/workflows/helm-build-push.yml@main
+    secrets: inherit
+    with:
+      env_json: ${{ needs.load-config.outputs.env_json }}
+      version: ${{ needs.check-version.outputs.version }}
+
   docker-gitops:
-    name: GitOps
+    name: Update docker
-    needs: [docker-build-push, load-config, check-version]
+    needs: [docker-build-push]
     uses: niko/gitea-ci-library/.gitea/workflows/gitops-dispatch.yml@main
     secrets: inherit
     with:
@@ -74,7 +85,7 @@ jobs:
 
   tag-maintenance:
     name: Move provider version tag
-    needs: [docker-gitops]
+    needs: [docker-build-push, helm-build-push]
     if: success()
     uses: niko/gitea-ci-library/.gitea/workflows/tag-maintenance.yml@main
     secrets: inherit

.gitea/workflows/git-pages.ci-main.yml

@@ -10,14 +10,14 @@ on:
 
 jobs:
   load-config:
-    name: Config load
+    name: Load git-pages.gitea-env.conf to pipeline env
     uses: niko/gitea-ci-library/.gitea/workflows/config-provider.yml@main
     secrets: inherit
     with:
       config_path: .gitea/workflows/git-pages.gitea-env.conf
 
   check-version:
-    name: Latest version
+    name: Check existing artifact
     needs: [load-config]
     uses: niko/gitea-ci-library/.gitea/workflows/check-version.yml@main
     secrets: inherit
@@ -36,9 +36,9 @@ jobs:
       chart_path: git-pages
 
   chart-gitops:
-    name: GitOps
+    name: Update chart to the cluster
-    needs: [helm-push, load-config, check-version]
+    needs: [helm-push]
-    uses: niko/gitea-ci-library/.gitea/workflows/gitops-dispatch.yml@main
+    uses: niko/gitea-ci-library/.gitea/workflows/gitops-dispatch.yml
     secrets: inherit
     with:
       env_json: ${{ needs.load-config.outputs.env_json }}
@@ -49,7 +49,7 @@ jobs:
 
   report-summary:
     name: Report Summary
-    needs: [load-config, check-version, helm-push, chart-gitops]
+    needs: [load-config, helm-push, chart-gitops]
     if: always()
     uses: niko/gitea-ci-library/.gitea/workflows/report-summary.yml@main
     with:

scripts/gitops-dispatch.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-echo "gitops-dispatch: validating env vars..."
 : "${GITOPS_FILE:?}"
 : "${GITOPS_YQ_TPL:?}"
 : "${GITOPS_VERSION:?}"
@@ -14,7 +13,6 @@ echo "gitops-dispatch: validating env vars..."
 
 TIMEOUT="${GITOPS_DISPATCH_TIMEOUT:-30}"
 
-echo "gitops-dispatch: constructing inputs..."
 INPUTS=$(jq -nc \
   --arg file "$GITOPS_FILE" \
   --arg yq_tpl "$GITOPS_YQ_TPL" \
@@ -25,7 +23,6 @@ INPUTS=$(jq -nc \
   '{file: $file, yq_tpl: $yq_tpl, version: $version, source_repo: $source_repo, source_commit: $source_commit, git_tag_prefix: $git_tag_prefix}')
 
 DIR="$(cd "$(dirname "$0")" && pwd)"
-echo "gitops-dispatch: dispatching to $GITOPS_REPO/$GITOPS_WORKFLOW..."
 set +e
 OUTPUT=$(bash "$DIR/dispatch-workflow.sh" \
   "$GITOPS_REPO" "$GITOPS_WORKFLOW" "main" \
@@ -33,9 +30,7 @@ OUTPUT=$(bash "$DIR/dispatch-workflow.sh" \
 EXIT=$?
 set -e
 
-echo "=== DISPATCH OUTPUT (exit=$EXIT) ==="
 echo "$OUTPUT"
-echo "=== END DISPATCH ==="
 
 STATUS="failure"
 GITOPS_SHA=""