Feature/git pages -> oma nginx perusteinen raporointipalvelu (#48)

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

scripts/ci-report.sh

@@ -98,7 +98,7 @@ if [ "$TOTAL" -eq 1 ]; then
     SINGLE_ENTRY="${first_name}/index.html"
   fi
 
-  URL="${GIT_PAGES_URL}/${GITHUB_REPOSITORY}/reports/${SHA8}/${SUITE}/${SINGLE_ENTRY}"
+  URL="${GIT_PAGES_URL}/${GITHUB_REPOSITORY}/${GITHUB_REF_NAME}/${SHA8}/${SUITE}/${SINGLE_ENTRY}"
   sh .ci/scripts/report-status.sh "$STATUS" "$DESCRIPTION" "$CONTEXT" "" "$URL"
 else
   generate_index

scripts/ci-validate.sh

@@ -21,7 +21,7 @@ while IFS='=' read -r key value || [ -n "$key" ]; do
 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
+[ -z "${REPORTS_PUBLISH_TOKEN:-}" ] && echo "ERROR: REPORTS_PUBLISH_TOKEN secret is not set" >&2 && ERRORS=1
 
 if [ "$ERRORS" -ne 0 ]; then
   echo "FATAL: CI config validation failed" >&2

scripts/publish-git-pages.sh

@@ -4,54 +4,48 @@ set -eu
 SUITE_PATH="${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 "${REPORTS_PUBLISH_TOKEN:-}" ] || { echo "ERROR: REPORTS_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; }
+[ -n "${GITHUB_REF_NAME:-}" ] || { echo "ERROR: GITHUB_REF_NAME is not set" >&2; exit 1; }
 
 OWNER="${GITHUB_REPOSITORY%%/*}"
 REPO="${GITHUB_REPOSITORY##*/}"
 SHA8=$(echo "$GITHUB_SHA" | cut -c1-8)
+BRANCH="${GITHUB_REF_NAME}"
+SUITE="${SUITE_PATH%/}"
 PAGES_USER="${GIT_PAGES_PUBLISH_USER:-publish}"
-REPORT_DIR="reports/${SHA8}/${SUITE_PATH%/}"
-REPORT_BASE="${GIT_PAGES_URL}/${OWNER}/${REPO}/reports/${SHA8}"
 
-[ -d "$REPORT_DIR" ] || { echo "ERROR: not a directory: $REPORT_DIR" >&2; exit 1; }
-
-PUBLISH_SITE_URL="${GIT_PAGES_URL}/"
+[ -d "$SUITE" ] || { echo "ERROR: not a directory: $SUITE" >&2; exit 1; }
 
 WORK=$(mktemp -d)
 TAR=$(mktemp)
 trap 'rm -rf "$WORK" "$TAR"' EXIT
 
-RELPATH="${REPORT_DIR#reports/${SHA8}/}"
-if [ "$RELPATH" != "$REPORT_DIR" ] && [ -n "$RELPATH" ]; then
-  TARGET="$WORK/${OWNER}/${REPO}/reports/${SHA8}/${RELPATH}"
-else
-  TARGET="$WORK/${OWNER}/${REPO}/reports/${SHA8}"
-fi
-mkdir -p "$TARGET"
-cp -a "$REPORT_DIR/." "$TARGET/"
+# Kopioi raporttitiedostot
+mkdir -p "$WORK/$SUITE"
+cp -a "$SUITE/." "$WORK/$SUITE/"
 
-if [ ! -f "$TARGET/index.html" ]; then
+# Generoi index.html (sama logiikka kuin nykyään)
+cd "$WORK/$SUITE"
+if [ ! -f "index.html" ]; then
   ITEM_LIST=""
   ITEM_COUNT=0
 
-  for f in "$TARGET"/*; do
+  for f in *; do
     [ -f "$f" ] || continue
-    base=$(basename "$f")
-    [ "$base" = "index.html" ] && continue
-    ITEM_LIST="${ITEM_LIST}file:${base}
+    [ "$f" = "index.html" ] && continue
+    ITEM_LIST="${ITEM_LIST}file:${f}
 "
     ITEM_COUNT=$((ITEM_COUNT + 1))
   done
 
-  for d in "$TARGET"/*/; do
+  for d in */; do
     [ -d "$d" ] || continue
-    base=$(basename "$d")
+    d="${d%/}"
     [ -f "$d/index.html" ] || continue
-    ITEM_LIST="${ITEM_LIST}dir:${base}
+    ITEM_LIST="${ITEM_LIST}dir:${d}
 "
     ITEM_COUNT=$((ITEM_COUNT + 1))
   done
@@ -82,36 +76,36 @@ if [ ! -f "$TARGET/index.html" ]; then
       done
 
       echo '</ul></body></html>'
-    } > "$TARGET/index.html"
+    } > "index.html"
   fi
 fi
 
-cat > "$TARGET/.meta" <<EOF
-{"branch":"${GITHUB_REF_NAME:-}","sha":"${GITHUB_SHA}","published_at":"$(date -u +%Y-%m-%dT%H:%M:%SZ)"}
+# .meta tiedosto retentionia varten
+cat > ".meta" <<EOF
+{"branch":"${BRANCH}","sha":"${GITHUB_SHA}","published_at":"$(date -u +%Y-%m-%dT%H:%M:%SZ)"}
 EOF
-find "$WORK/$OWNER" \( -type f -o -type l \) -print | sed "s|^${WORK}/||" | tar -cf "$TAR" -C "$WORK" -T -
 
-publish() {
-  method="$1"
-  curl -sS -X "$method" "$PUBLISH_SITE_URL" \
-    -u "${PAGES_USER}:${GIT_PAGES_PUBLISH_TOKEN}" \
-    -H "Content-Type: application/x-tar" \
-    -H "Atomic: no" \
-    -H "Create-Parents: yes" \
-    --data-binary @"$TAR" \
-    -o /tmp/git-pages-publish-response.txt \
-    -w "%{http_code}"
-}
+cd "$WORK"
 
-HTTP_CODE=$(publish PATCH)
+# Pakkaa: pelkät tiedostot ilman $SUITE-etuliitettä
+tar czf "$TAR" -C "$WORK/$SUITE" .
+
+# PUT upload-sidecariin
+PUBLISH_URL="${GIT_PAGES_URL}/${OWNER}/${REPO}/${BRANCH}/${SHA8}/${SUITE}/"
+HTTP_CODE=$(curl -sS -X PUT "$PUBLISH_URL" \
+  -u "${PAGES_USER}:${REPORTS_PUBLISH_TOKEN}" \
+  -H "Content-Type: application/tar+gz" \
+  --data-binary @"$TAR" \
+  -o /tmp/git-pages-publish-response.txt \
+  -w "%{http_code}")
 
 case "$HTTP_CODE" in
   200|201|204) ;;
   *)
-    echo "ERROR: git-pages publish HTTP ${HTTP_CODE}" >&2
+    echo "ERROR: publish HTTP ${HTTP_CODE}" >&2
     cat /tmp/git-pages-publish-response.txt >&2
     exit 1
     ;;
 esac
 
-echo "$REPORT_BASE"
+echo "${PUBLISH_URL}"

scripts/publish.sh

@@ -7,7 +7,7 @@ SUITE_PATH="${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; }
+[ -n "${REPORTS_PUBLISH_TOKEN:-}" ] || { echo "ERROR: REPORTS_PUBLISH_TOKEN is not set" >&2; exit 1; }
 
 SCRIPT_DIR="$(dirname "$0")"
 

scripts/report-status.sh

@@ -18,7 +18,7 @@ if [ -n "$CUSTOM_URL" ]; then
 elif [ -n "$SUITE" ]; then
   SUITE="${SUITE%/}/"
   SHA8_CUT=$(echo "$GITHUB_SHA" | cut -c1-8)
-  URL="${GIT_PAGES_URL}/${GITHUB_REPOSITORY}/reports/${SHA8_CUT}/${SUITE}"
+  URL="${GIT_PAGES_URL}/${GITHUB_REPOSITORY}/${GITHUB_REF_NAME}/${SHA8_CUT}/${SUITE}"
 else
   URL="${GITEA_API_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
 fi