pipeline siivous ja testikattavuuden nosto (#9)

Co-authored-by: moilanik <niko.moilanen@tietoevry.com>
Reviewed-on: #9

scripts/ci-validate.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+CONF_FILE="${CI_CONF_FILE:-.gitea/workflows/gitea-env.conf}"
+ERRORS=0
+
+[ -f "$CONF_FILE" ] || { echo "ERROR: $CONF_FILE not found — checkout missing?" >&2; exit 1; }
+
+echo "Reading $CONF_FILE..."
+
+while IFS='=' read -r key value || [ -n "$key" ]; do
+  key=$(echo "$key" | xargs)
+  value=$(echo "$value" | xargs)
+  [ -z "$key" ] && continue
+  [[ "$key" == "#"* ]] && continue
+  [ -z "$value" ] && echo "ERROR: $key is empty in $CONF_FILE" >&2 && ERRORS=1
+  if [ -n "$value" ] && [[ "$key" == *"URL"* ]] && [[ "$value" != http://* ]] && [[ "$value" != https://* ]]; then
+    echo "ERROR: $key should be a URL (http/https), got: $value" >&2
+    ERRORS=1
+  fi
+done < "$CONF_FILE"
+
+[ -z "${GITEA_TOKEN:-}" ] && echo "ERROR: GITEA_TOKEN secret is not set" >&2 && ERRORS=1
+[ -z "${GIT_PAGES_PUBLISH_TOKEN:-}" ] && echo "ERROR: GIT_PAGES_PUBLISH_TOKEN secret is not set" >&2 && ERRORS=1
+
+if [ "$ERRORS" -ne 0 ]; then
+  echo "FATAL: CI config validation failed" >&2
+  exit 1
+fi
+
+echo "OK: all CI env vars validated"

scripts/dispatch-workflow.sh

@@ -1,20 +1,21 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-[ -z "${GITEA_API_URL:-}" ] && echo "ERROR: GITEA_API_URL is not set" >&2 && exit 1
-[ -z "${GITEA_TOKEN:-}" ] && echo "ERROR: GITEA_TOKEN is not set" >&2 && exit 1
-
 TARGET_REPO="${1:-}"
 WORKFLOW_FILE="${2:-}"
 REF="${3:-}"
 INPUTS_JSON="${4:-}"
-TIMEOUT_MINUTES="${5:-360}"
+GITEA_API_URL="${5:-}"
+GITEA_TOKEN="${6:-}"
+TIMEOUT_MINUTES="${7:-360}"
 POLL_INTERVAL="${DISPATCH_POLL_INTERVAL:-10}"
 
 [ -z "$TARGET_REPO" ] && echo "ERROR: target_repo argument is required" >&2 && exit 1
 [ -z "$WORKFLOW_FILE" ] && echo "ERROR: workflow_file argument is required" >&2 && exit 1
 [ -z "$REF" ] && echo "ERROR: ref argument is required" >&2 && exit 1
 [ -z "$INPUTS_JSON" ] && echo "ERROR: inputs_json argument is required" >&2 && exit 1
+[ -z "$GITEA_API_URL" ] && echo "ERROR: gitea_api_url argument is required" >&2 && exit 1
+[ -z "$GITEA_TOKEN" ] && echo "ERROR: gitea_token argument is required" >&2 && exit 1
 
 DISPATCH_URL="$GITEA_API_URL/api/v1/repos/$TARGET_REPO/actions/workflows/$WORKFLOW_FILE/dispatches"
 DISPATCH_BODY=$(jq -nc --arg ref "$REF" --argjson inputs "$INPUTS_JSON" '{ref: $ref, inputs: $inputs}')

scripts/publish-git-pages.sh

@@ -1,29 +1,25 @@
 #!/usr/bin/env bash
-# Publish a report directory to git-pages apex index-site via Traefik (BasicAuth).
-# Public URL: https://{PAGES_HOST}/{owner}/{repo}/reports/{sha8}/index.html
 set -euo pipefail
 
-REPORT_DIR="${1:-}"
-PAGES_HOST="${PAGES_HOST:-}"
-GIT_PAGES_PUBLISH_URL="${GIT_PAGES_PUBLISH_URL:-https://pages.helm-dev.keskikuja.site}"
-GIT_PAGES_PUBLISH_TOKEN="${GIT_PAGES_PUBLISH_TOKEN:-}"
-GIT_PAGES_PUBLISH_USER="${GIT_PAGES_PUBLISH_USER:-publish}"
-REPO_SLUG="${GITHUB_REPOSITORY:-}"
+SUITE_PATH="${1:-}"
 
-[ -n "$REPORT_DIR" ] || { echo "ERROR: report directory argument required" >&2; exit 1; }
-[ -d "$REPORT_DIR" ] || { echo "ERROR: not a directory: $REPORT_DIR" >&2; exit 1; }
-[ -n "$PAGES_HOST" ] || { echo "ERROR: PAGES_HOST is not set" >&2; exit 1; }
-[ -n "$GIT_PAGES_PUBLISH_TOKEN" ] || { echo "ERROR: GIT_PAGES_PUBLISH_TOKEN is not set" >&2; exit 1; }
-[ -n "$REPO_SLUG" ] || { echo "ERROR: GITHUB_REPOSITORY is not set" >&2; exit 1; }
+[ -n "$SUITE_PATH" ] || { echo "ERROR: suite_path argument required" >&2; exit 1; }
+[ -n "${GITEA_API_URL:-}" ] || { echo "ERROR: GITEA_API_URL is not set" >&2; exit 1; }
+[ -n "${GIT_PAGES_URL:-}" ] || { echo "ERROR: GIT_PAGES_URL is not set" >&2; exit 1; }
+[ -n "${GIT_PAGES_PUBLISH_TOKEN:-}" ] || { echo "ERROR: GIT_PAGES_PUBLISH_TOKEN is not set" >&2; exit 1; }
+[ -n "${GITHUB_REPOSITORY:-}" ] || { echo "ERROR: GITHUB_REPOSITORY is not set" >&2; exit 1; }
 [ -n "${GITHUB_SHA:-}" ] || { echo "ERROR: GITHUB_SHA is not set" >&2; exit 1; }
 
-OWNER="${REPO_SLUG%%/*}"
-REPO="${REPO_SLUG##*/}"
+OWNER="${GITHUB_REPOSITORY%%/*}"
+REPO="${GITHUB_REPOSITORY##*/}"
 SHA8="${GITHUB_SHA:0:8}"
-REPORT_BASE="https://${PAGES_HOST}/${OWNER}/${REPO}/reports/${SHA8}"
+PAGES_USER="${GIT_PAGES_PUBLISH_USER:-publish}"
+REPORT_DIR="reports/${SHA8}/${SUITE_PATH%/}"
+REPORT_BASE="${GIT_PAGES_URL}/${OWNER}/${REPO}/reports/${SHA8}"
 
-PUBLISH_BASE="${GIT_PAGES_PUBLISH_URL%/}"
-PUBLISH_SITE_URL="${PUBLISH_BASE}/"
+[ -d "$REPORT_DIR" ] || { echo "ERROR: not a directory: $REPORT_DIR" >&2; exit 1; }
+
+PUBLISH_SITE_URL="${GIT_PAGES_URL}/"
 
 WORK=$(mktemp -d)
 TAR=$(mktemp)
@@ -45,7 +41,7 @@ find "$WORK/$OWNER" \( -type f -o -type l \) -print | sed "s|^${WORK}/||" | tar
 publish() {
   local method="$1"
   curl -sS -X "$method" "$PUBLISH_SITE_URL" \
-    -u "${GIT_PAGES_PUBLISH_USER}:${GIT_PAGES_PUBLISH_TOKEN}" \
+    -u "${PAGES_USER}:${GIT_PAGES_PUBLISH_TOKEN}" \
     -H "Content-Type: application/x-tar" \
     -H "Atomic: no" \
     -H "Create-Parents: yes" \

scripts/publish.sh

@@ -1,10 +1,16 @@
 #!/usr/bin/env bash
-# Vie raportit git-pagesiin + commit-status linkillä
 set -euo pipefail
 
-REPORT_DIR="${1:-reports}"
-PAGES_HOST="${PAGES_HOST:-ci-reports.helm-dev.keskikuja.site}"
+SUITE_PATH="${1:-}"
 
-REPORT_URL=$(bash "$(dirname $0)/publish-git-pages.sh" "$REPORT_DIR")
+[ -n "$SUITE_PATH" ] || { echo "ERROR: suite_path argument required" >&2; exit 1; }
+[ -n "${GITEA_API_URL:-}" ] || { echo "ERROR: GITEA_API_URL is not set" >&2; exit 1; }
+[ -n "${GITEA_TOKEN:-}" ] || { echo "ERROR: GITEA_TOKEN is not set" >&2; exit 1; }
+[ -n "${GIT_PAGES_URL:-}" ] || { echo "ERROR: GIT_PAGES_URL is not set" >&2; exit 1; }
+[ -n "${GIT_PAGES_PUBLISH_TOKEN:-}" ] || { echo "ERROR: GIT_PAGES_PUBLISH_TOKEN is not set" >&2; exit 1; }
+
+SCRIPT_DIR="$(dirname "$0")"
+
+REPORT_URL=$(bash "$SCRIPT_DIR/publish-git-pages.sh" "$SUITE_PATH")
 echo "Published: $REPORT_URL"
-bash "$(dirname $0)/report-status.sh" success "Reports published" "$REPORT_URL" ci-report
+bash "$SCRIPT_DIR/report-status.sh" success "Reports published" "ci-report"

scripts/report-status.sh

@@ -1,28 +1,26 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-[ -z "${GITEA_API_URL:-}" ] && echo "ERROR: GITEA_API_URL is not set" >&2 && exit 1
-[ -z "${GITEA_TOKEN:-}" ] && echo "ERROR: GITEA_TOKEN is not set" >&2 && exit 1
-
 STATE="${1:-}"
 DESCRIPTION="${2:-}"
-URL="${3:-}"
-KEY="${4:-commit-${GITHUB_SHA:0:8}}"
-ROOT_COMMIT="${5:-}"
-ROOT_REPO="${6:-}"
+KEY="${3:-commit-${GITHUB_SHA:0:8}}"
+SUITE="${4:-}"
 
 [ -z "$STATE" ] && echo "ERROR: state argument is required" >&2 && exit 1
 [ -z "$DESCRIPTION" ] && echo "ERROR: description argument is required" >&2 && exit 1
-[ -z "$URL" ] && echo "ERROR: url argument is required" >&2 && exit 1
+[ -z "${GITEA_API_URL:-}" ] && echo "ERROR: GITEA_API_URL is not set" >&2 && exit 1
+[ -z "${GITEA_TOKEN:-}" ] && echo "ERROR: GITEA_TOKEN is not set" >&2 && exit 1
 
-if [ -n "$ROOT_COMMIT" ] && [ -n "$ROOT_REPO" ]; then
-  REPO="$ROOT_REPO"
-  COMMIT="$ROOT_COMMIT"
+if [ -n "$SUITE" ]; then
+  SUITE="${SUITE%/}/"
+  URL="${GIT_PAGES_URL}/${GITHUB_REPOSITORY}/reports/${GITHUB_SHA:0:8}/${SUITE}"
 else
-  REPO="${GITHUB_REPOSITORY:-}"
-  COMMIT="${GITHUB_SHA:-}"
+  URL="${GITEA_API_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
 fi
 
+REPO="${ROOT_REPO:-${GITHUB_REPOSITORY:-}}"
+COMMIT="${ROOT_COMMIT:-${GITHUB_SHA:-}}"
+
 [ -z "$REPO" ] && echo "ERROR: GITHUB_REPOSITORY is not set" >&2 && exit 1
 [ -z "$COMMIT" ] && echo "ERROR: GITHUB_SHA is not set" >&2 && exit 1