From 3ee22694cc3c66577a5f9dd7856950fa726f6033 Mon Sep 17 00:00:00 2001 From: aevolution-gitops-bot Date: Thu, 8 Oct 2026 19:50:47 -0400 Subject: [PATCH] ci: retain previous build during image promotion --- .gitea/workflows/promote-dev.yaml | 58 ++++++++++++++++++++--------- .gitea/workflows/promote-stage.yaml | 58 ++++++++++++++++++++--------- 2 files changed, 82 insertions(+), 34 deletions(-) diff --git a/.gitea/workflows/promote-dev.yaml b/.gitea/workflows/promote-dev.yaml index 25e7069..6128669 100644 --- a/.gitea/workflows/promote-dev.yaml +++ b/.gitea/workflows/promote-dev.yaml @@ -37,7 +37,7 @@ jobs: set -eu bash tools/ci/prepare-kustomize.sh - - name: Update dev image and build identity + - name: Update dev image, build identity, and retention env: IMAGE_DIGEST: ${{ inputs.image_digest }} run: | @@ -48,22 +48,46 @@ jobs: if not re.fullmatch(r'sha256:[0-9a-f]{64}', digest): raise SystemExit('image_digest must be sha256: followed by 64 lowercase hexadecimal characters') build = digest[7:] - files = [ - 'deploy/kubernetes/region/dev/kustomization.yaml', - 'deploy/kubernetes/region/dev/region-values.yaml', - ] - for name in files: - text = open(name, encoding='utf-8').read() - if name.endswith('kustomization.yaml'): - text, count = re.subn(r'(?m)^ digest: sha256:[0-9a-f]{64}$', f' digest: {digest}', text) - if count != 1: - raise SystemExit(f'{name}: expected one server digest, found {count}') - else: - text, count = re.subn(r'(?m)(name: REGION_BUILD, value: )[0-9a-f]{64}', rf'\g<1>{build}', text) - if count != 2: - raise SystemExit(f'{name}: expected two REGION_BUILD values, found {count}') - open(name, 'w', encoding='utf-8').write(text) - print(f'Promoting dev to {digest}') + kustomization = 'deploy/kubernetes/region/dev/kustomization.yaml' + values = 'deploy/kubernetes/region/dev/region-values.yaml' + + ktext = open(kustomization, encoding='utf-8').read() + current_digest = re.search(r'(?m)^ digest: (sha256:[0-9a-f]{64})$', ktext) + if not current_digest: + raise SystemExit(f'{kustomization}: expected one server digest') + old_build = current_digest.group(1)[7:] + + vtext = open(values, encoding='utf-8').read() + builds = re.findall(r'(?m)name: REGION_BUILD, value: ([0-9a-f]{64})', vtext) + if len(builds) != 2 or len(set(builds)) != 1: + raise SystemExit(f'{values}: expected two matching REGION_BUILD values, found {builds}') + if builds[0] != old_build: + raise SystemExit(f'{values}: REGION_BUILD {builds[0]} does not match current image {old_build}') + + retained_match = re.search( + r'(?m)^(\s*- \{name: REGION_RETAINED, value: ")([0-9a-f ]*)("\})$', + vtext, + ) + if not retained_match: + raise SystemExit(f'{values}: expected REGION_RETAINED') + retained = retained_match.group(2).split() + if old_build not in retained: + retained.append(old_build) + retained = list(dict.fromkeys(retained)) + vtext = vtext[:retained_match.start(2)] + ' '.join(retained) + vtext[retained_match.end(2):] + vtext, count = re.subn( + r'(?m)(name: REGION_BUILD, value: )[0-9a-f]{64}', + rf'\g<1>{build}', + vtext, + ) + if count != 2: + raise SystemExit(f'{values}: expected two REGION_BUILD values, found {count}') + ktext, count = re.subn(r'(?m)^ digest: sha256:[0-9a-f]{64}$', f' digest: {digest}', ktext) + if count != 1: + raise SystemExit(f'{kustomization}: expected one server digest, found {count}') + open(kustomization, 'w', encoding='utf-8').write(ktext) + open(values, 'w', encoding='utf-8').write(vtext) + print(f'Promoting dev from {old_build} to {build}; retained previous build') PY - name: Renew dev M10 session window diff --git a/.gitea/workflows/promote-stage.yaml b/.gitea/workflows/promote-stage.yaml index bf42cf2..27e5a4c 100644 --- a/.gitea/workflows/promote-stage.yaml +++ b/.gitea/workflows/promote-stage.yaml @@ -32,7 +32,7 @@ jobs: python3 -m pip install --user --break-system-packages \ --disable-pip-version-check PyYAML - - name: Update stage image and build identity + - name: Update stage image, build identity, and retention env: IMAGE_DIGEST: ${{ inputs.image_digest }} run: | @@ -43,22 +43,46 @@ jobs: if not re.fullmatch(r'sha256:[0-9a-f]{64}', digest): raise SystemExit('image_digest must be sha256: followed by 64 lowercase hexadecimal characters') build = digest[7:] - files = [ - 'deploy/kubernetes/region/stage/kustomization.yaml', - 'deploy/kubernetes/region/stage/region-values.yaml', - ] - for name in files: - text = open(name, encoding='utf-8').read() - if name.endswith('kustomization.yaml'): - text, count = re.subn(r'(?m)^ digest: sha256:[0-9a-f]{64}$', f' digest: {digest}', text) - if count != 1: - raise SystemExit(f'{name}: expected one server digest, found {count}') - else: - text, count = re.subn(r'(?m)(name: REGION_BUILD, value: )[0-9a-f]{64}', rf'\g<1>{build}', text) - if count != 2: - raise SystemExit(f'{name}: expected two REGION_BUILD values, found {count}') - open(name, 'w', encoding='utf-8').write(text) - print(f'Promoting stage to {digest}') + kustomization = 'deploy/kubernetes/region/stage/kustomization.yaml' + values = 'deploy/kubernetes/region/stage/region-values.yaml' + + ktext = open(kustomization, encoding='utf-8').read() + current_digest = re.search(r'(?m)^ digest: (sha256:[0-9a-f]{64})$', ktext) + if not current_digest: + raise SystemExit(f'{kustomization}: expected one server digest') + old_build = current_digest.group(1)[7:] + + vtext = open(values, encoding='utf-8').read() + builds = re.findall(r'(?m)name: REGION_BUILD, value: ([0-9a-f]{64})', vtext) + if len(builds) != 2 or len(set(builds)) != 1: + raise SystemExit(f'{values}: expected two matching REGION_BUILD values, found {builds}') + if builds[0] != old_build: + raise SystemExit(f'{values}: REGION_BUILD {builds[0]} does not match current image {old_build}') + + retained_match = re.search( + r'(?m)^(\s*- \{name: REGION_RETAINED, value: ")([0-9a-f ]*)("\})$', + vtext, + ) + if not retained_match: + raise SystemExit(f'{values}: expected REGION_RETAINED') + retained = retained_match.group(2).split() + if old_build not in retained: + retained.append(old_build) + retained = list(dict.fromkeys(retained)) + vtext = vtext[:retained_match.start(2)] + ' '.join(retained) + vtext[retained_match.end(2):] + vtext, count = re.subn( + r'(?m)(name: REGION_BUILD, value: )[0-9a-f]{64}', + rf'\g<1>{build}', + vtext, + ) + if count != 2: + raise SystemExit(f'{values}: expected two REGION_BUILD values, found {count}') + ktext, count = re.subn(r'(?m)^ digest: sha256:[0-9a-f]{64}$', f' digest: {digest}', ktext) + if count != 1: + raise SystemExit(f'{kustomization}: expected one server digest, found {count}') + open(kustomization, 'w', encoding='utf-8').write(ktext) + open(values, 'w', encoding='utf-8').write(vtext) + print(f'Promoting stage from {old_build} to {build}; retained previous build') PY - name: Validate and commit promotion