Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4910565547 |
@@ -0,0 +1,20 @@
|
|||||||
|
.git/
|
||||||
|
.gitignore
|
||||||
|
node_modules/
|
||||||
|
reports/
|
||||||
|
coverage/
|
||||||
|
.ai/
|
||||||
|
.cursor/
|
||||||
|
.vscode/
|
||||||
|
tmp/
|
||||||
|
.DS_Store
|
||||||
|
*.md
|
||||||
|
docs/
|
||||||
|
guides/
|
||||||
|
.simplecov
|
||||||
|
cucumber.js
|
||||||
|
package-lock.json
|
||||||
|
package.json
|
||||||
|
CURRENT_PROVIDER_VERSION
|
||||||
|
README.md
|
||||||
|
AGENTS.md
|
||||||
@@ -41,12 +41,14 @@ jobs:
|
|||||||
TAG="${{ inputs.tag }}"
|
TAG="${{ inputs.tag }}"
|
||||||
|
|
||||||
NOW=$(date -u +%Y-%m-%dT%H:%M:%SZ)
|
NOW=$(date -u +%Y-%m-%dT%H:%M:%SZ)
|
||||||
|
CONTEXT_DIR=$(dirname "${DOCKERFILE}")
|
||||||
docker build \
|
docker build \
|
||||||
--label "git.commit=${{ github.sha }}" \
|
--label "git.commit=${{ github.sha }}" \
|
||||||
--label "git.commitBy=${{ github.actor }}" \
|
--label "git.commitBy=${{ github.actor }}" \
|
||||||
--label "build.date=${NOW}" \
|
--label "build.date=${NOW}" \
|
||||||
-f "${DOCKERFILE}" \
|
-f "${DOCKERFILE}" \
|
||||||
-t "${IMAGE_NAME}:${TAG}" .
|
-t "${IMAGE_NAME}:${TAG}" \
|
||||||
|
"${CONTEXT_DIR}"
|
||||||
|
|
||||||
FULL_IMAGE="${REGISTRY}/${IMAGE_NAME}:${TAG}"
|
FULL_IMAGE="${REGISTRY}/${IMAGE_NAME}:${TAG}"
|
||||||
echo "Pushing ${FULL_IMAGE} ..."
|
echo "Pushing ${FULL_IMAGE} ..."
|
||||||
|
|||||||
@@ -52,13 +52,15 @@ jobs:
|
|||||||
REGISTRY_HOST="${REGISTRY%%/*}"
|
REGISTRY_HOST="${REGISTRY%%/*}"
|
||||||
|
|
||||||
NOW=$(date -u +%Y-%m-%dT%H:%M:%SZ)
|
NOW=$(date -u +%Y-%m-%dT%H:%M:%SZ)
|
||||||
|
CONTEXT_DIR=$(dirname "${DOCKERFILE}")
|
||||||
docker build \
|
docker build \
|
||||||
--label "git.commit=${{ github.sha }}" \
|
--label "git.commit=${{ github.sha }}" \
|
||||||
--label "git.commitBy=${{ github.actor }}" \
|
--label "git.commitBy=${{ github.actor }}" \
|
||||||
--label "build.date=${NOW}" \
|
--label "build.date=${NOW}" \
|
||||||
-f "${DOCKERFILE}" \
|
-f "${DOCKERFILE}" \
|
||||||
-t "${IMAGE}:${VERSION}" \
|
-t "${IMAGE}:${VERSION}" \
|
||||||
-t "${IMAGE}:latest" .
|
-t "${IMAGE}:latest" \
|
||||||
|
"${CONTEXT_DIR}"
|
||||||
|
|
||||||
FULL_IMAGE="${REGISTRY}/${IMAGE}:${VERSION}"
|
FULL_IMAGE="${REGISTRY}/${IMAGE}:${VERSION}"
|
||||||
echo "Pushing ${FULL_IMAGE} ..."
|
echo "Pushing ${FULL_IMAGE} ..."
|
||||||
@@ -81,12 +83,11 @@ jobs:
|
|||||||
if [ -n "${DOCKER_UI_URL:-}" ] && [ -n "${VERSION:-}" ]; then
|
if [ -n "${DOCKER_UI_URL:-}" ] && [ -n "${VERSION:-}" ]; then
|
||||||
CONTAINER_URL="${DOCKER_UI_URL}/${DOCKER_IMAGE_NAME}/${VERSION}"
|
CONTAINER_URL="${DOCKER_UI_URL}/${DOCKER_IMAGE_NAME}/${VERSION}"
|
||||||
fi
|
fi
|
||||||
DIR=$(dirname "${DOCKERFILE}")
|
bash .ci/scripts/report-status.sh success "Docker build & push ${VERSION} OK" ci-docker-build-push "" "$CONTAINER_URL"
|
||||||
if [ "$DIR" != "." ]; then
|
|
||||||
bash .ci/scripts/report-status.sh success "${DIR}: Docker push ${VERSION}" "${DIR}-ci-docker-build-push" "" "$CONTAINER_URL"
|
- name: Report status FAILURE
|
||||||
else
|
if: failure()
|
||||||
bash .ci/scripts/report-status.sh success "Docker push ${VERSION}" ci-docker-build-push "" "$CONTAINER_URL"
|
run: bash .ci/scripts/report-status.sh failure "Docker build & push ${VERSION} FAILED" ci-docker-build-push
|
||||||
fi
|
|
||||||
|
|
||||||
tag-commit:
|
tag-commit:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|||||||
@@ -8,10 +8,6 @@ on:
|
|||||||
version:
|
version:
|
||||||
required: true
|
required: true
|
||||||
type: string
|
type: string
|
||||||
chart_path:
|
|
||||||
required: false
|
|
||||||
type: string
|
|
||||||
default: '.'
|
|
||||||
secrets:
|
secrets:
|
||||||
GITEA_TOKEN:
|
GITEA_TOKEN:
|
||||||
required: true
|
required: true
|
||||||
@@ -26,7 +22,7 @@ env:
|
|||||||
HELM_REGISTRY: ${{ fromJson(inputs.env_json).HELM_REGISTRY || '' }}
|
HELM_REGISTRY: ${{ fromJson(inputs.env_json).HELM_REGISTRY || '' }}
|
||||||
HELM_UI_URL: ${{ fromJson(inputs.env_json).HELM_UI_URL || '' }}
|
HELM_UI_URL: ${{ fromJson(inputs.env_json).HELM_UI_URL || '' }}
|
||||||
GIT_TAG_PREFIX: ${{ fromJson(inputs.env_json).GIT_TAG_PREFIX || '' }}
|
GIT_TAG_PREFIX: ${{ fromJson(inputs.env_json).GIT_TAG_PREFIX || '' }}
|
||||||
CHART_PATH: ${{ inputs.chart_path }}
|
CHART_FILE: ${{ fromJson(inputs.env_json).VERSION_FILE || 'Chart.yaml' }}
|
||||||
VERSION: ${{ inputs.version }}
|
VERSION: ${{ inputs.version }}
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
@@ -53,8 +49,9 @@ jobs:
|
|||||||
|
|
||||||
- name: Package Helm chart
|
- name: Package Helm chart
|
||||||
run: |
|
run: |
|
||||||
helm dependency update "${CHART_PATH}"
|
CHART_DIR=$(dirname "${CHART_FILE}")
|
||||||
helm package "${CHART_PATH}" \
|
helm dependency update "${CHART_DIR}"
|
||||||
|
helm package "${CHART_DIR}" \
|
||||||
--version "${VERSION}" \
|
--version "${VERSION}" \
|
||||||
--app-version "${VERSION}" \
|
--app-version "${VERSION}" \
|
||||||
--destination /tmp/helm-packages
|
--destination /tmp/helm-packages
|
||||||
@@ -74,13 +71,9 @@ jobs:
|
|||||||
- name: Report status with UI link
|
- name: Report status with UI link
|
||||||
if: success() && env.HELM_UI_URL != ''
|
if: success() && env.HELM_UI_URL != ''
|
||||||
run: |
|
run: |
|
||||||
CHART_NAME=$(grep '^name:' "${CHART_PATH}/Chart.yaml" | awk '{print $2}')
|
CHART_NAME=$(grep '^name:' "${CHART_FILE}" | awk '{print $2}')
|
||||||
UI_URL="${HELM_UI_URL}/${CHART_NAME}/${VERSION}"
|
UI_URL="${HELM_UI_URL}/${CHART_NAME}/${VERSION}"
|
||||||
if [ "${CHART_PATH}" != "." ] && [ -n "${CHART_PATH}" ]; then
|
bash .ci/scripts/report-status.sh success "Helm chart ${VERSION}" ci-helm-build-push "" "$UI_URL"
|
||||||
bash .ci/scripts/report-status.sh success "${CHART_PATH}: Helm push ${VERSION}" "${CHART_PATH}-ci-helm-build-push" "" "$UI_URL"
|
|
||||||
else
|
|
||||||
bash .ci/scripts/report-status.sh success "Helm push ${VERSION}" ci-helm-build-push "" "$UI_URL"
|
|
||||||
fi
|
|
||||||
|
|
||||||
tag-commit:
|
tag-commit:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|||||||
+2
-1
@@ -37,7 +37,7 @@ kuuluu `git-pages/docs/`-alle, ei juuren `docs/`-kansioon.
|
|||||||
| `git-pages/` | Raporttien hostaus (Helm-chartti) |
|
| `git-pages/` | Raporttien hostaus (Helm-chartti) |
|
||||||
| `tests/` | Bats-testit skripteille |
|
| `tests/` | Bats-testit skripteille |
|
||||||
|
|
||||||
### Provider workflowt (5 kpl)
|
### Provider workflowt (6 kpl)
|
||||||
|
|
||||||
| Workflow | Input | Output | Kuvaus |
|
| Workflow | Input | Output | Kuvaus |
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
@@ -46,6 +46,7 @@ kuuluu `git-pages/docs/`-alle, ei juuren `docs/`-kansioon.
|
|||||||
| `docker-build-push.yml` | `env_json`, `version` | — | Buildaa Docker-imagen, puskea rekisteriin, tagittaa commitin. |
|
| `docker-build-push.yml` | `env_json`, `version` | — | Buildaa Docker-imagen, puskea rekisteriin, tagittaa commitin. |
|
||||||
| `ci-container-build-push.yml` | `env_json`, `dockerfile_path`, `image_name`, `tag` | — | Buildaa CI-työkalukontin, puskea rekisteriin. Ei versiointia eikä git-tägäystä. |
|
| `ci-container-build-push.yml` | `env_json`, `dockerfile_path`, `image_name`, `tag` | — | Buildaa CI-työkalukontin, puskea rekisteriin. Ei versiointia eikä git-tägäystä. |
|
||||||
| `report-summary.yml` | `env_json`, `suites` | — | Generoi `GITHUB_STEP_SUMMARY`-taulukon raporttilinkeillä (Gitea 1.27+) |
|
| `report-summary.yml` | `env_json`, `suites` | — | Generoi `GITHUB_STEP_SUMMARY`-taulukon raporttilinkeillä (Gitea 1.27+) |
|
||||||
|
| `helm-build-push.yml` | `env_json`, `version` | — | Pakkaa + puskea Helm chartin OCI-registryyn, tagittaa commitin. **Tekninen velka:** asentaa node.js:n runtime-vaiheessa (`apk add --no-cache nodejs` ennen checkouttia) koska `alpine/helm`-kontissa ei ole nodea. Rikkoo Offline Container -periaatetta. Ratkaistaan myöhemmin: proper multi-tool CI-kontti (helm + nodejs + git) docker hubiin. Ei consumerin ongelma. |
|
||||||
|
|
||||||
### Example-tiedostot (consumer-referenssi)
|
### Example-tiedostot (consumer-referenssi)
|
||||||
|
|
||||||
|
|||||||
@@ -176,90 +176,46 @@ if [ "${#TO_DELETE[@]}" -eq 0 ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "=== Phase 4: full site rebuild ==="
|
echo "=== Phase 4: whiteout deletion ==="
|
||||||
echo "Rebuilding site (${#TO_DELETE[@]} report(s) to delete)..."
|
echo "Creating whiteout tar for ${#TO_DELETE[@]} report(s)..."
|
||||||
|
|
||||||
ARCHIVE_FILE=$(mktemp)
|
WHITEOUT_TAR=$(mktemp)
|
||||||
SITE_DIR=$(mktemp -d)
|
trap 'rm -f "$WHITEOUT_TAR"' EXIT
|
||||||
NEW_TAR=$(mktemp)
|
|
||||||
cleanup_phase4() {
|
|
||||||
rm -f "$ARCHIVE_FILE" "$NEW_TAR"
|
|
||||||
rm -rf "$SITE_DIR"
|
|
||||||
}
|
|
||||||
trap cleanup_phase4 EXIT
|
|
||||||
|
|
||||||
# Try archive.tar first
|
python3 -c "
|
||||||
echo "Downloading archive.tar..."
|
import tarfile, sys
|
||||||
HTTP_CODE=$(curl_with_host -o "$ARCHIVE_FILE" -w "%{http_code}" -sS "${PAGES_URL}/.git-pages/archive.tar")
|
|
||||||
|
|
||||||
if [ "$HTTP_CODE" = "200" ] && tar -tf "$ARCHIVE_FILE" >/dev/null 2>&1; then
|
tar = tarfile.open(name='${WHITEOUT_TAR}', mode='w')
|
||||||
echo "Extracting archive..."
|
|
||||||
tar -xf "$ARCHIVE_FILE" -C "$SITE_DIR"
|
|
||||||
|
|
||||||
for dir in "${TO_DELETE[@]}"; do
|
dirs = set()
|
||||||
if [ -d "$SITE_DIR/$dir" ]; then
|
for d in sys.argv[1:]:
|
||||||
echo " Removing: $dir"
|
dirs.add(d.strip())
|
||||||
rm -rf "$SITE_DIR/$dir"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
else
|
|
||||||
echo "archive.tar failed (HTTP ${HTTP_CODE}) - falling back to manifest-based rebuild"
|
|
||||||
|
|
||||||
ALL_PATHS=$(echo "$MANIFEST" | jq -r '.contents | keys[]' 2>/dev/null || true)
|
tarinfo = tarfile.TarInfo()
|
||||||
|
tarinfo.type = tarfile.CHRTYPE
|
||||||
|
tarinfo.devmajor = 0
|
||||||
|
tarinfo.devminor = 0
|
||||||
|
|
||||||
if [ -z "$ALL_PATHS" ]; then
|
for d in sorted(dirs, key=len, reverse=True):
|
||||||
echo "ERROR: no files in manifest - cannot rebuild" >&2
|
info = tarinfo
|
||||||
exit 1
|
info.name = d
|
||||||
fi
|
tar.addfile(info)
|
||||||
|
|
||||||
EXCLUDE_GREP=""
|
tar.close()
|
||||||
for dir in "${TO_DELETE[@]}"; do
|
" "${TO_DELETE[@]}"
|
||||||
EXCLUDE_GREP="${EXCLUDE_GREP}${EXCLUDE_GREP:+|}^${dir}/"
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ -n "$EXCLUDE_GREP" ]; then
|
echo "Patching ${PAGES_URL}/ with whiteout tar..."
|
||||||
KEEP_PATHS=$(echo "$ALL_PATHS" | grep -v -E "$EXCLUDE_GREP" || true)
|
HTTP_CODE=$(curl_with_host -X PATCH "${PAGES_URL}/" \
|
||||||
else
|
|
||||||
KEEP_PATHS="$ALL_PATHS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$KEEP_PATHS" ]; then
|
|
||||||
echo "No files to keep - site will be empty"
|
|
||||||
mkdir -p "$SITE_DIR/__placeholder__"
|
|
||||||
echo "placeholder" > "$SITE_DIR/__placeholder__/index.html"
|
|
||||||
else
|
|
||||||
FILE_COUNT=$(echo "$KEEP_PATHS" | wc -l | tr -d ' ')
|
|
||||||
echo "Downloading ${FILE_COUNT} file(s)..."
|
|
||||||
while IFS= read -r path; do
|
|
||||||
[ -z "$path" ] && continue
|
|
||||||
dir=$(dirname "$SITE_DIR/$path")
|
|
||||||
mkdir -p "$dir"
|
|
||||||
curl_with_host -o "$SITE_DIR/$path" -sS "${PAGES_URL}/${path}" || {
|
|
||||||
echo " WARN: failed to download ${path}"
|
|
||||||
}
|
|
||||||
done <<< "$KEEP_PATHS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$(ls -A "$SITE_DIR" 2>/dev/null)" ]; then
|
|
||||||
echo "Site is empty - creating placeholder"
|
|
||||||
mkdir -p "$SITE_DIR/__placeholder__"
|
|
||||||
echo "placeholder" > "$SITE_DIR/__placeholder__/index.html"
|
|
||||||
fi
|
|
||||||
|
|
||||||
tar -cf "$NEW_TAR" -C "$SITE_DIR" .
|
|
||||||
|
|
||||||
echo "PUT: replacing site contents..."
|
|
||||||
HTTP_CODE=$(curl_with_host -X PUT "${PAGES_URL}/" \
|
|
||||||
-H "Content-Type: application/x-tar" \
|
-H "Content-Type: application/x-tar" \
|
||||||
--data-binary @"${NEW_TAR}" \
|
-H "Atomic: no" \
|
||||||
|
--data-binary @"${WHITEOUT_TAR}" \
|
||||||
-w "%{http_code}" \
|
-w "%{http_code}" \
|
||||||
-o /dev/null)
|
-o /dev/null)
|
||||||
|
|
||||||
echo "HTTP ${HTTP_CODE}"
|
echo "HTTP $HTTP_CODE"
|
||||||
if [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "201" ] || [ "$HTTP_CODE" = "204" ]; then
|
if [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "204" ]; then
|
||||||
echo "Site rebuild completed."
|
echo "Retention cleanup finished."
|
||||||
else
|
else
|
||||||
echo "ERROR: PUT HTTP ${HTTP_CODE}" >&2
|
echo "ERROR: retention HTTP ${HTTP_CODE}" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ metadata:
|
|||||||
labels:
|
labels:
|
||||||
{{- include "git-pages.componentLabels" . | nindent 4 }}
|
{{- include "git-pages.componentLabels" . | nindent 4 }}
|
||||||
annotations:
|
annotations:
|
||||||
"helm.sh/hook": post-install
|
"helm.sh/hook": post-install, post-upgrade
|
||||||
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
|
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
|
||||||
spec:
|
spec:
|
||||||
backoffLimit: 5
|
backoffLimit: 5
|
||||||
@@ -32,16 +32,6 @@ spec:
|
|||||||
-H "Host: {{ .Values.ingress.host }}" \
|
-H "Host: {{ .Values.ingress.host }}" \
|
||||||
-o /dev/null "http://git-pages:3000/.git-pages/health"
|
-o /dev/null "http://git-pages:3000/.git-pages/health"
|
||||||
do sleep 2; done
|
do sleep 2; done
|
||||||
echo "Init: checking if site already exists..."
|
|
||||||
MANIFEST=$(curl -sf \
|
|
||||||
-H "Host: {{ .Values.ingress.host }}" \
|
|
||||||
"http://git-pages:3000/.git-pages/manifest.json" 2>/dev/null || echo "")
|
|
||||||
|
|
||||||
if echo "$MANIFEST" | grep -q '"contents"'; then
|
|
||||||
echo "Init: site already initialized, skipping"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Init: creating placeholder site..."
|
echo "Init: creating placeholder site..."
|
||||||
WORK=$(mktemp -d)
|
WORK=$(mktemp -d)
|
||||||
mkdir -p "$WORK/__init__"
|
mkdir -p "$WORK/__init__"
|
||||||
|
|||||||
@@ -202,16 +202,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Report
|
- name: Report
|
||||||
if: always()
|
if: always()
|
||||||
run: |
|
run: bash .ci/scripts/ci-report.sh "<kuvaus>" <context> <suite> ${{ job.status }}
|
||||||
bash .ci/scripts/ci-report.sh "<Test type> test report" <context> <suite> ${{ job.status }}
|
|
||||||
```
|
|
||||||
|
|
||||||
Monorepossa context ja description sisältävät komponentin nimen:
|
|
||||||
```yaml
|
|
||||||
- name: Report
|
|
||||||
if: always()
|
|
||||||
run: |
|
|
||||||
bash .ci/scripts/ci-report.sh "<Komponentti>: <Test type> test report" <komponentti>.<context> <suite> ${{ job.status }}
|
|
||||||
```
|
```
|
||||||
|
|
||||||
**Usean runnerin cache-ongelma:** Jos eri kerroilla käynnistyy eri runnereita,
|
**Usean runnerin cache-ongelma:** Jos eri kerroilla käynnistyy eri runnereita,
|
||||||
@@ -227,7 +218,6 @@ niillä voi olla eri versio `latest`-imagen digesteistä. Ratkaisuja:
|
|||||||
|
|
||||||
### Taso 1: Ei jälkikäsittelyä
|
### Taso 1: Ei jälkikäsittelyä
|
||||||
|
|
||||||
Single repo:
|
|
||||||
```yaml
|
```yaml
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -237,27 +227,11 @@ Single repo:
|
|||||||
|
|
||||||
- name: Report
|
- name: Report
|
||||||
if: always()
|
if: always()
|
||||||
run: |
|
run: bash .ci/scripts/ci-report.sh "<kuvaus>" <context> <suite> ${{ job.status }}
|
||||||
bash .ci/scripts/ci-report.sh "<Test type> test report" <context> <suite> ${{ job.status }}
|
|
||||||
```
|
|
||||||
|
|
||||||
Monorepo:
|
|
||||||
```yaml
|
|
||||||
- name: Run tests
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
mkdir -p "reports/<suite>"
|
|
||||||
<testikomento>
|
|
||||||
|
|
||||||
- name: Report
|
|
||||||
if: always()
|
|
||||||
run: |
|
|
||||||
bash .ci/scripts/ci-report.sh "<Komponentti>: <Test type> test report" <komponentti>.<context> <suite> ${{ job.status }}
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Taso 2: Jälkikäsittely tarvitaan
|
### Taso 2: Jälkikäsittely tarvitaan
|
||||||
|
|
||||||
Single repo:
|
|
||||||
```yaml
|
```yaml
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -275,30 +249,7 @@ Single repo:
|
|||||||
|
|
||||||
- name: Report
|
- name: Report
|
||||||
if: always()
|
if: always()
|
||||||
run: |
|
run: bash .ci/scripts/ci-report.sh "<kuvaus>" <context> <suite> ${{ job.status }}
|
||||||
bash .ci/scripts/ci-report.sh "<Test type> test report" <context> <suite> ${{ job.status }}
|
|
||||||
```
|
|
||||||
|
|
||||||
Monorepo:
|
|
||||||
```yaml
|
|
||||||
- name: Run tests
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
mkdir -p "reports/<suite>"
|
|
||||||
<testikomento> > "reports/<suite>/results.txt" 2>&1
|
|
||||||
|
|
||||||
- name: Post-process coverage
|
|
||||||
if: always()
|
|
||||||
run: <siirrä coverage-data reports/<suite>/coverage/-hakemistoon>
|
|
||||||
|
|
||||||
- name: Post-process test report
|
|
||||||
if: always()
|
|
||||||
run: <HTML-generointi raa'asta outputista>
|
|
||||||
|
|
||||||
- name: Report
|
|
||||||
if: always()
|
|
||||||
run: |
|
|
||||||
bash .ci/scripts/ci-report.sh "<Komponentti>: <Test type> test report" <komponentti>.<context> <suite> ${{ job.status }}
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Väärin vs oikein — yksi asia per step
|
### Väärin vs oikein — yksi asia per step
|
||||||
@@ -322,16 +273,7 @@ Monorepo:
|
|||||||
|
|
||||||
- name: Report
|
- name: Report
|
||||||
if: always()
|
if: always()
|
||||||
run: |
|
run: bash .ci/scripts/ci-report.sh "Helm kubeconform" helm-test kubeconform ${{ job.status }}
|
||||||
bash .ci/scripts/ci-report.sh "Helm kubeconform" helm-test kubeconform ${{ job.status }}
|
|
||||||
```
|
|
||||||
|
|
||||||
Monorepossa:
|
|
||||||
```yaml
|
|
||||||
- name: Report
|
|
||||||
if: always()
|
|
||||||
run: |
|
|
||||||
bash .ci/scripts/ci-report.sh "<Komponentti>: Helm kubeconform" <komponentti>.helm-test kubeconform ${{ job.status }}
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Väärin vs oikein — post-process
|
### Väärin vs oikein — post-process
|
||||||
@@ -567,15 +509,6 @@ jobs:
|
|||||||
suites: '<suite-1> <suite-2>'
|
suites: '<suite-1> <suite-2>'
|
||||||
```
|
```
|
||||||
|
|
||||||
**Commit status -kontekstit monorepossa:** Testiraporttien `ci-report.sh`-kutsussa
|
|
||||||
context ja description sisältävät komponentin nimen:
|
|
||||||
```yaml
|
|
||||||
- name: Report
|
|
||||||
if: always()
|
|
||||||
run: |
|
|
||||||
bash .ci/scripts/ci-report.sh "<Komponentti>: Unit test report" <komponentti>.unit-tests bats ${{ job.status }}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Version elinkaari per komponentti
|
### Version elinkaari per komponentti
|
||||||
|
|
||||||
`GIT_TAG_PREFIX` takaa että eri komponenttien versiohistoria pysyy erillään.
|
`GIT_TAG_PREFIX` takaa että eri komponenttien versiohistoria pysyy erillään.
|
||||||
|
|||||||
@@ -123,6 +123,88 @@ ajetaan kontin *sisällä* — myös `actions/checkout@v4`. Se on JavaScript-act
|
|||||||
joka vaatii sekä `nodejs` että `git`. Varmista että CI-kontin Dockerfilessä on
|
joka vaatii sekä `nodejs` että `git`. Varmista että CI-kontin Dockerfilessä on
|
||||||
molemmat — muuten checkout ei toimi ja pipeline failaa.
|
molemmat — muuten checkout ei toimi ja pipeline failaa.
|
||||||
|
|
||||||
|
### 4.4 Build-konteksti, `.dockerignore` ja `COPY`
|
||||||
|
|
||||||
|
**Build-konteksti** on aina tiedoston (Dockerfile, Chart.yaml) oman hakemiston
|
||||||
|
juuri (`dirname "${DOCKERFILE}"` / `dirname "${CHART_FILE}"`). Kaikki
|
||||||
|
suhteelliset polut — ignore-tiedosto, `COPY`, `ADD` — ovat suhteessa tähän
|
||||||
|
kontekstiin.
|
||||||
|
|
||||||
|
| Tiedosto | Konteksti | Ignore-tiedosto | Käyttö |
|
||||||
|
|---|---|---|---|
|
||||||
|
| `Dockerfile` | `.` | `./.dockerignore` | `docker build` / `COPY src/ src/` |
|
||||||
|
| `api/Dockerfile` | `api/` | `api/.dockerignore` | `docker build` / `COPY src/ src/` |
|
||||||
|
| `Chart.yaml` (`VERSION_FILE`) | `.` | `./.helmignore` | `helm package` |
|
||||||
|
| `api/Chart.yaml` (`VERSION_FILE`) | `api/` | `api/.helmignore` | `helm package` |
|
||||||
|
|
||||||
|
Helm chartin polku luetaan confin `VERSION_FILE`-kentästä — sama rivi jota
|
||||||
|
`check-version.yml` käyttää version lähteenä. Yksi conf-rivi ohjaa molempia:
|
||||||
|
sekä versionlaskentaa että chartin sijaintia.
|
||||||
|
|
||||||
|
**Mitä ignore-tiedosto sisältää:** Kaikki mikä EI ole konttiin tai chart-pakettiin
|
||||||
|
tarkoitettua koodia tai resurssia, ON oltava ignore-tiedostossa:
|
||||||
|
|
||||||
|
- Git- ja CI-historia (`.git/`, `.gitea/`, `.github/`)
|
||||||
|
- Testikoodi, testidata, testiraportit (`tests/`, `reports/`, `coverage/`)
|
||||||
|
- Dokumentaatio (`docs/`, `guides/`, `*.md`, `CHANGELOG`, `README`)
|
||||||
|
- Editori- ja työkalukonfiguraatio (`.vscode/`, `.cursor/`, `.idea/`, `.DS_Store`)
|
||||||
|
- Riippuvuudet jotka asennetaan Dockerfilessä (`node_modules/`)
|
||||||
|
- Väliaikaistiedostot (`tmp/`, `*.log`)
|
||||||
|
- Projektikohtaiset konfiguraatiot (`.env`, `*.conf`, `CURRENT_PROVIDER_VERSION`)
|
||||||
|
|
||||||
|
**Miksi:** Build-kontekstin koko vaikuttaa suoraan `docker build` -nopeuteen.
|
||||||
|
Raskas konteksti (etenkin `.git/` ja `node_modules/`) hidastaa buildia ja
|
||||||
|
kuluttaa runnerin resursseja turhaan. Ylimääräiset tiedostot kontissa ovat
|
||||||
|
**tietoturvariski** — tokenit, `.env` ja sensitiivinen data voivat päätyä
|
||||||
|
kontin layeriin jos `.dockerignore` ei ole kattava.
|
||||||
|
|
||||||
|
### 4.5 `COPY`-kuri — kopioi vain tarvittava
|
||||||
|
|
||||||
|
`COPY . .` on kielletty. Jokainen `COPY` kopioi vain tarvittavat tiedostot
|
||||||
|
tai hakemistot:
|
||||||
|
|
||||||
|
```dockerfile
|
||||||
|
# VÄÄRIN
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# OIKEIN
|
||||||
|
COPY package.json package-lock.json ./
|
||||||
|
COPY src/ src/
|
||||||
|
COPY public/ public/
|
||||||
|
```
|
||||||
|
|
||||||
|
**Miksi:**
|
||||||
|
- Layer-cache: `COPY . .` rikkoo välimuistin — mikä tahansa muutos
|
||||||
|
tiedostossa tyhjentää koko layerin
|
||||||
|
- Tietoturva: konttiin voi päätyä ylimääräisiä tiedostoja vaikka
|
||||||
|
`.dockerignore` olisi kattava (unohtunut ignore-rivi, uusi työkalu
|
||||||
|
joka luo tiedostoja build-kontekstiin)
|
||||||
|
- Luettavuus: `COPY . .` ei kerro mitä kontti todella sisältää
|
||||||
|
- Kontin koko: eksplisiittinen `COPY` pitää image-koon kurissa
|
||||||
|
|
||||||
|
### 4.6 `.helmignore` — pidä chart-paketti siistinä
|
||||||
|
|
||||||
|
`helm package` käyttää `.helmignore`-tiedostoa samalla periaatteella kuin
|
||||||
|
`docker build` käyttää `.dockerignore`a:
|
||||||
|
|
||||||
|
- Chart-hakemisto luetaan confin `VERSION_FILE`-kentästä (`dirname "${VERSION_FILE}"`)
|
||||||
|
- ignore-tiedosto luetaan chart-hakemiston juuresta (sama konteksti kuin
|
||||||
|
`Chart.yaml`, ks. 4.4)
|
||||||
|
- Kaikki turha (testit, docs, git, CI-konffit, kuvat) on poissuljettava
|
||||||
|
- Jos `.helmignore` puuttuu, `helm package` paketoi mukaan kaikki
|
||||||
|
chart-hakemiston tiedostot — turhaa bulkkia registryyn
|
||||||
|
|
||||||
|
**`.helmignore` on pakollinen** jokaiselle chartille. Minimisisältö:
|
||||||
|
|
||||||
|
```
|
||||||
|
.git/
|
||||||
|
.gitignore
|
||||||
|
tests/
|
||||||
|
docs/
|
||||||
|
*.md
|
||||||
|
.DS_Store
|
||||||
|
```
|
||||||
|
|
||||||
## 5. Raporttitasot
|
## 5. Raporttitasot
|
||||||
|
|
||||||
Testi tuottaa raportin `reports/<suite>/`-hakemistoon. Yksi `ci-report.sh`-kutsu hoitaa sekä
|
Testi tuottaa raportin `reports/<suite>/`-hakemistoon. Yksi `ci-report.sh`-kutsu hoitaa sekä
|
||||||
@@ -158,35 +240,6 @@ Tiedostonimet `.gitea/workflows/`-kansiossa noudattavat yhtenäistä rakennetta:
|
|||||||
Single repossa `<komponentti>` jätetään pois.
|
Single repossa `<komponentti>` jätetään pois.
|
||||||
Monorepossa prefiksi pitää komponentin tiedostot yhdessä.
|
Monorepossa prefiksi pitää komponentin tiedostot yhdessä.
|
||||||
|
|
||||||
### 6.1 Commit status -nimeäminen
|
|
||||||
|
|
||||||
`ci-report.sh`-kutsun `description` (2. argumentti) ja `context` (3. argumentti)
|
|
||||||
noudattavat seuraavaa kaavaa:
|
|
||||||
|
|
||||||
**Single repo:**
|
|
||||||
```
|
|
||||||
context: <testityyppi> (esim. unit-tests, acc-tests)
|
|
||||||
description: <Test type> test report (esim. Unit test report)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Monorepo:**
|
|
||||||
```
|
|
||||||
context: <komponentti>.<testityyppi> (esim. library.unit-tests)
|
|
||||||
description: <Komponentti>: <Test type> test report (esim. Library: Unit test report)
|
|
||||||
```
|
|
||||||
|
|
||||||
> Gitea YAML: `run:` laita lainausmerkeillä `run: |`-blockiin — Gitea ei tue lainausmerkkejä yhden rivin `run:`-komennoissa.
|
|
||||||
>
|
|
||||||
> ```yaml
|
|
||||||
> - name: Report
|
|
||||||
> if: always()
|
|
||||||
> run: |
|
|
||||||
> bash .ci/scripts/ci-report.sh "<Komponentti>: <Test type> test report" <komponentti>.<context> <suite> ${{ job.status }}
|
|
||||||
> ```
|
|
||||||
|
|
||||||
Build/push-status (Docker, Helm) on providerin hallussa — consumer ei vaikuta
|
|
||||||
niiden nimeämiseen.
|
|
||||||
|
|
||||||
## 7. Artifact-kuri
|
## 7. Artifact-kuri
|
||||||
|
|
||||||
Gitea Actionsin `upload-artifact` jättää pysyvän tiedoston. Artifakteja ei käytetä
|
Gitea Actionsin `upload-artifact` jättää pysyvän tiedoston. Artifakteja ei käytetä
|
||||||
@@ -286,6 +339,7 @@ Pakkaa ja pushee Helm-chartin OCI-registryyn. Käyttää `alpine/helm`-konttia.
|
|||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
HELM_REGISTRY: gitea.app.keskikuja.site/niko
|
HELM_REGISTRY: gitea.app.keskikuja.site/niko
|
||||||
|
VERSION_FILE: platform-helm/Chart.yaml # chart-hakemisto + versionlähde
|
||||||
```
|
```
|
||||||
|
|
||||||
**Käyttö reitittimessä:**
|
**Käyttö reitittimessä:**
|
||||||
@@ -299,20 +353,163 @@ helm-build-push:
|
|||||||
with:
|
with:
|
||||||
env_json: ${{ needs.load-config.outputs.env_json }}
|
env_json: ${{ needs.load-config.outputs.env_json }}
|
||||||
version: ${{ needs.check-version.outputs.version }}
|
version: ${{ needs.check-version.outputs.version }}
|
||||||
# chart_path: '.' # oletus, vaihda jos Chart.yaml on alihakemistossa
|
|
||||||
```
|
```
|
||||||
|
|
||||||
**Vanhentunut käytäntö:** Nykyinen `helm-build-push.yml` asentaa node.js:n
|
Chart-hakemisto johdetaan `VERSION_FILE`-polusta: `dirname "${VERSION_FILE}"`.
|
||||||
lennossa `apk add --no-cache nodejs` ennen checkouttia — tämä rikkoo
|
Jos `VERSION_FILE` on `Chart.yaml`, konteksti on juuri. Jos `platform-helm/Chart.yaml`,
|
||||||
Offline Container -vaatimusta (4.1).
|
konteksti on `platform-helm/`.
|
||||||
|
|
||||||
**Korjaustoimenpide:** Rakenna custom CI-kontti `ci-container-build`-skillillä
|
|
||||||
jossa on helm + nodejs + git (katso pre-cache-esimerkit `REFERENCE.md`:stä),
|
|
||||||
päivitä workflow'n `container: image:` osoittamaan omaan konttiin, ja poista
|
|
||||||
runtime-apk.
|
|
||||||
|
|
||||||
**Yksittäisten Helm-UI-linkkien raportointi:** `HELM_UI_URL` on
|
**Yksittäisten Helm-UI-linkkien raportointi:** `HELM_UI_URL` on
|
||||||
tarkoitettu yleiselle registry UI:lle — provider muodostaa linkin
|
tarkoitettu yleiselle registry UI:lle — provider muodostaa linkin
|
||||||
`${HELM_UI_URL}/${CHART_NAME}/${VERSION}` automaattisesti.
|
`${HELM_UI_URL}/${CHART_NAME}/${VERSION}` automaattisesti.
|
||||||
|
|
||||||
Tarkka input/secret-lista: `docs/workflows.md`.
|
Tarkka input/secret-lista: `docs/workflows.md`.
|
||||||
|
|
||||||
|
## 11. Multi-artifact monorepo -komponentti
|
||||||
|
|
||||||
|
Yksi monorepo-komponentti voi tuottaa useita artefakteja (esim. Docker image
|
||||||
|
+ Helm chart). Kukin artefakti on **omassa reitittimessään** — ei yhtä
|
||||||
|
monoliittista pipelinea. Tämä on tietoinen arkkitehtuurivalinta:
|
||||||
|
|
||||||
|
- Reitittimet ovat itsenäisiä: eri `paths:`-triggerit, eri tagit, eri confit
|
||||||
|
- Yksi commit voi triggeröidä molemmat rinnakkain
|
||||||
|
- Yhden artefaktin build tai testi ei estä toista
|
||||||
|
|
||||||
|
### Esimerkki: `platform-helm` joka tuottaa Docker-imagen ja Helm chartin
|
||||||
|
|
||||||
|
```
|
||||||
|
.gitea/workflows/
|
||||||
|
├── platform-helm.ci-main.yml # Docker build & push
|
||||||
|
├── platform-helm.gitea-env.conf # Docker-konffi
|
||||||
|
├── platform-helm.helm-ci-main.yml # Helm build & push
|
||||||
|
├── platform-helm.helm-gitea-env.conf # Helm-konffi
|
||||||
|
├── platform-helm.helm-chart-lint.yml # Chart-testi
|
||||||
|
└── platform-helm.ci-container-build-helm.yml # CI-kontin build
|
||||||
|
```
|
||||||
|
|
||||||
|
### `platform-helm.gitea-env.conf` (Docker)
|
||||||
|
|
||||||
|
```ini
|
||||||
|
DOCKER_REGISTRY=gitea.app.keskikuja.site/niko
|
||||||
|
DOCKER_IMAGE_NAME=platform-helm
|
||||||
|
GIT_TAG_PREFIX=platform-helm/
|
||||||
|
```
|
||||||
|
|
||||||
|
### `platform-helm.helm-gitea-env.conf` (Helm)
|
||||||
|
|
||||||
|
```ini
|
||||||
|
HELM_REGISTRY=gitea.app.keskikuja.site/niko
|
||||||
|
VERSION_FILE=platform-helm/Chart.yaml
|
||||||
|
GIT_TAG_PREFIX=chart/
|
||||||
|
```
|
||||||
|
|
||||||
|
### Reitittimet
|
||||||
|
|
||||||
|
**`platform-helm.ci-main.yml`** — Docker-buildi, testit, oma tagi:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
name: platform-helm CI Main
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
paths:
|
||||||
|
- platform-helm/**
|
||||||
|
- .gitea/workflows/platform-helm.*
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
load-config:
|
||||||
|
uses: OWNER/gitea-ci-library/.gitea/workflows/config-provider.yml@v1
|
||||||
|
secrets: inherit
|
||||||
|
with:
|
||||||
|
config_path: .gitea/workflows/platform-helm.gitea-env.conf
|
||||||
|
|
||||||
|
check-version:
|
||||||
|
needs: [load-config]
|
||||||
|
uses: OWNER/gitea-ci-library/.gitea/workflows/check-version.yml@v1
|
||||||
|
secrets: inherit
|
||||||
|
with:
|
||||||
|
env_json: ${{ needs.load-config.outputs.env_json }}
|
||||||
|
|
||||||
|
test:
|
||||||
|
needs: [load-config, check-version]
|
||||||
|
uses: ./.gitea/workflows/platform-helm.sbom-lint.yml
|
||||||
|
secrets: inherit
|
||||||
|
with:
|
||||||
|
env_json: ${{ needs.load-config.outputs.env_json }}
|
||||||
|
|
||||||
|
build-push:
|
||||||
|
needs: [load-config, check-version, test]
|
||||||
|
if: needs.check-version.outputs.artifact_exists == 'false'
|
||||||
|
uses: OWNER/gitea-ci-library/.gitea/workflows/docker-build-push.yml@v1
|
||||||
|
secrets: inherit
|
||||||
|
with:
|
||||||
|
env_json: ${{ needs.load-config.outputs.env_json }}
|
||||||
|
version: ${{ needs.check-version.outputs.version }}
|
||||||
|
|
||||||
|
report-summary:
|
||||||
|
needs: [load-config, test, build-push]
|
||||||
|
if: always()
|
||||||
|
uses: OWNER/gitea-ci-library/.gitea/workflows/report-summary.yml@v1
|
||||||
|
with:
|
||||||
|
env_json: ${{ needs.load-config.outputs.env_json }}
|
||||||
|
suites: ''
|
||||||
|
```
|
||||||
|
|
||||||
|
**`platform-helm.helm-ci-main.yml`** — Helm-buildi, chart-testi, oma tagi:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
name: platform-helm Helm CI Main
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
paths:
|
||||||
|
- platform-helm/**
|
||||||
|
- .gitea/workflows/platform-helm.helm*
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
load-config:
|
||||||
|
uses: OWNER/gitea-ci-library/.gitea/workflows/config-provider.yml@v1
|
||||||
|
secrets: inherit
|
||||||
|
with:
|
||||||
|
config_path: .gitea/workflows/platform-helm.helm-gitea-env.conf
|
||||||
|
|
||||||
|
check-version:
|
||||||
|
needs: [load-config]
|
||||||
|
uses: OWNER/gitea-ci-library/.gitea/workflows/check-version.yml@v1
|
||||||
|
secrets: inherit
|
||||||
|
with:
|
||||||
|
env_json: ${{ needs.load-config.outputs.env_json }}
|
||||||
|
|
||||||
|
chart-lint:
|
||||||
|
needs: [load-config, check-version]
|
||||||
|
uses: ./.gitea/workflows/platform-helm.helm-chart-lint.yml
|
||||||
|
secrets: inherit
|
||||||
|
with:
|
||||||
|
env_json: ${{ needs.load-config.outputs.env_json }}
|
||||||
|
|
||||||
|
helm-build-push:
|
||||||
|
needs: [load-config, check-version, chart-lint]
|
||||||
|
if: needs.check-version.outputs.artifact_exists == 'false'
|
||||||
|
uses: OWNER/gitea-ci-library/.gitea/workflows/helm-build-push.yml@v1
|
||||||
|
secrets: inherit
|
||||||
|
with:
|
||||||
|
env_json: ${{ needs.load-config.outputs.env_json }}
|
||||||
|
version: ${{ needs.check-version.outputs.version }}
|
||||||
|
|
||||||
|
report-summary:
|
||||||
|
needs: [load-config, chart-lint, helm-build-push]
|
||||||
|
if: always()
|
||||||
|
uses: OWNER/gitea-ci-library/.gitea/workflows/report-summary.yml@v1
|
||||||
|
with:
|
||||||
|
env_json: ${{ needs.load-config.outputs.env_json }}
|
||||||
|
suites: ''
|
||||||
|
```
|
||||||
|
|
||||||
|
### Säännöt
|
||||||
|
|
||||||
|
- Jokaisella artefaktilla on oma reititin, oma conf, omat testit
|
||||||
|
- Conf-tiedoston nimi erottaa artefaktit: `<komponentti>.gitea-env.conf` vs
|
||||||
|
`<komponentti>.helm-gitea-env.conf`
|
||||||
|
- `<komponentti>.helm-`-prefiksi erottaa Helm-artefaktin tiedostot
|
||||||
|
- `GIT_TAG_PREFIX` pitää tagit erillään: `platform-helm/1.2.3` vs `chart/1.2.3`
|
||||||
|
- Molemmat reitittimet voivat triggeröityä samasta commitista
|
||||||
|
|||||||
Reference in New Issue
Block a user