From ec22d490393f01ec8ef4daaca7d5f67e203db0c9 Mon Sep 17 00:00:00 2001 From: moilanik Date: Mon, 22 Jun 2026 05:33:11 +0300 Subject: [PATCH] monorepossa komponetti parametrina --- .gitea/workflows/poc-dispatch.yml | 3 ++- scripts/gitops-update.sh | 25 +++++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/poc-dispatch.yml b/.gitea/workflows/poc-dispatch.yml index 6adca10..6783fb3 100644 --- a/.gitea/workflows/poc-dispatch.yml +++ b/.gitea/workflows/poc-dispatch.yml @@ -30,7 +30,8 @@ jobs: --arg version "0.2.0" \ --arg source_repo "${{ github.repository }}" \ --arg source_commit "${{ github.sha }}" \ - '{dispatch_id: $dispatch_id, file: $file, yq_tpl: $yq_tpl, version: $version, source_repo: $source_repo, source_commit: $source_commit}') + --arg git_tag_prefix "poc-test" \ + '{dispatch_id: $dispatch_id, file: $file, yq_tpl: $yq_tpl, version: $version, source_repo: $source_repo, source_commit: $source_commit, git_tag_prefix: $git_tag_prefix}') curl -s -X POST \ "https://gitea.app.keskikuja.site/api/v1/repos/niko/gitea-ci-gitops-tests/actions/workflows/gitops-service.yaml/dispatches" \ -H "Authorization: token ${{ secrets.GITOPS_DISPATCH_TOKEN }}" \ diff --git a/scripts/gitops-update.sh b/scripts/gitops-update.sh index d86e28f..87c4f88 100755 --- a/scripts/gitops-update.sh +++ b/scripts/gitops-update.sh @@ -10,11 +10,17 @@ _gitops_fail() { if [ -n "${GITOPS_REPO:-}" ] && [ -n "${GITOPS_SHA:-}" ] && \ [ -n "${SOURCE_REPO:-}" ] && [ -n "${SOURCE_COMMIT:-}" ] && \ [ -n "${GITEA_API_URL:-}" ] && [ -n "${GITEA_TOKEN:-}" ]; then - local SOURCE_URL="${GITEA_API_URL}/${SOURCE_REPO}/commits/${SOURCE_COMMIT}" + local env repo context + env=$(dirname "${INPUT_FILE}") + repo=$(basename "${SOURCE_REPO}") + context="${repo}" + [ -n "${GIT_TAG_PREFIX:-}" ] && context="${repo}/${GIT_TAG_PREFIX}" + + local SOURCE_URL="${GITEA_API_URL}/${SOURCE_REPO}/commit/${SOURCE_COMMIT}" ROOT_REPO="${GITOPS_REPO}" ROOT_COMMIT="${GITOPS_SHA}" \ GITEA_API_URL="${GITEA_API_URL}" GITEA_TOKEN="${GITEA_TOKEN}" \ - bash "${SCRIPT_DIR}/report-status.sh" failure "${MSG}" \ - "source/${SOURCE_REPO}" "" "${SOURCE_URL}" 2>/dev/null || true + bash "${SCRIPT_DIR}/report-status.sh" failure "Install to ${env} ${VERSION}" \ + "${context}" "" "${SOURCE_URL}" 2>/dev/null || true fi exit 1 @@ -32,12 +38,19 @@ _gitops_validate() { } _gitops_success() { - local SOURCE_URL="${GITEA_API_URL}/${SOURCE_REPO}/commits/${SOURCE_COMMIT}" + local env repo context + env=$(dirname "${INPUT_FILE}") + repo=$(basename "${SOURCE_REPO}") + context="${repo}" + [ -n "${GIT_TAG_PREFIX:-}" ] && context="${repo}/${GIT_TAG_PREFIX}" + + local SOURCE_URL="${GITEA_API_URL}/${SOURCE_REPO}/commit/${SOURCE_COMMIT}" ROOT_REPO="${GITOPS_REPO}" ROOT_COMMIT="${GITOPS_SHA}" \ GITEA_API_URL="${GITEA_API_URL}" GITEA_TOKEN="${GITEA_TOKEN}" \ - bash "${SCRIPT_DIR}/report-status.sh" success "Source build" \ - "source/${SOURCE_REPO}" "" "${SOURCE_URL}" + bash "${SCRIPT_DIR}/report-status.sh" success \ + "Install to ${env} ${VERSION}" \ + "${context}" "" "${SOURCE_URL}" } _gitops_substitute() {