test

.gitea/workflows/wf_full.yaml

@@ -3,6 +3,7 @@ on:
   push:
     tags:
       - '*_*'
+      - '!*_k8s'
 
 jobs:
   build-process:
@@ -14,6 +15,14 @@ jobs:
       repo: ${{ env.REPO }}
       buildres: ${{ steps.build-script.outcome }}
     steps:
+      - name: Update apt
+        uses: actions/init-alt-env@v1
+      - name: Install requires
+        run: |
+          echo "apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl"
+          apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl
+          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch"
+          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch
       - name: Check workspace
         run: |
           repourl=$(echo $GU | cut -d '/' -f 3)
@@ -25,23 +34,6 @@ jobs:
         env:
           GU: ${{ gitea.server_url }}
           GR: ${{ gitea.repository }}
-      - name: Set repo for c10f2 (Temporary)
-        if: ${{ contains(github.ref_name, 'c10f2') }}
-        run: |
-          echo "event tag=${{ github.ref_name }}" 
-          echo "10.4.0.3        update.altsp.su" >> /etc/hosts
-          echo "cat /etc/hosts"
-          cat /etc/hosts
-      - name: Update apt
-        uses: actions/init-alt-env@v1
-      - name: Install requires
-        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 python3-module-yaml python3-module-requests podman buildah jq curl
-          echo "apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch"
-          apt-get install -y qemu-user-static-binfmt-aarch64 qemu-user-static-binfmt-arm qemu-user-static-binfmt-ppc qemu-user-static-binfmt-riscv qemu-user-static-binfmt-loongarch
-      - name: Check out current repo
-        uses: actions/checkout@v4
       - name: Parse target branch and tag from events context, save to env
         env:
           EV: ${{ toJson(gitea.event) }}
@@ -51,6 +43,15 @@ jobs:
           org=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
           echo "ORG=$org" >> ${GITHUB_ENV}
           echo "ORG=$org"
+      - name: Set repo for c10f2 (Temporary)
+        if: ${{ contains(github.ref_name, 'c10f2') }}
+        run: |
+          echo "event tag=${{ github.ref_name }}" 
+          echo "10.4.0.3        update.altsp.su" >> /etc/hosts
+          echo "cat /etc/hosts"
+          cat /etc/hosts
+      - name: Check out current repo
+        uses: actions/checkout@v4
       - name: Login podman gitea
         run: |
           echo "podman login ${{ env.URL }}"
@@ -61,14 +62,16 @@ jobs:
       - name: Run building script
         id: build-script
         run: |
-          build_args="-b $BR --latest $BR -o $ORG --registry gitea.basealt.ru/alt"
-          if [[ "$BR" == "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64"; else arches="--arches amd64 386 arm64"; fi
-          if [[ "$ORG" == "k8s" ]]; then build_args="$build_args --overwrite-organization $ORG-$BR --package-versions {\"k8s/kube-apiserver\":\"1.31\",\"k8s/kube-scheduler\":\"1.31\",\"k8s/kube-controller-manager\":\"1.31\",\"k8s/kube-proxy\":\"1.31\",\"k8s/coredns\":\"1.11.3\",\"k8s/kubelet\":\"1.31\"}"; fi
-          echo "build.py $build_args $arches"
+          #build base with riskv64 for sisyphus if it is
+          if [[ "$BR" == "sisyphus" && "$ORG" == "base" ]]; then echo "${{ gitea.workspace }}/build.py --log-level debug -i base/base -b $BR --latest $BR --registry $BUILD_URL"; ${{ gitea.workspace }}/build.py -i base/base -b "$BR" --latest "$BR" --registry "$BUILD_URL"; fi
+          build_args="-b $BR --log-level debug --latest $BR -o $ORG --registry $BUILD_URL --package-versions {\"alt/etcd\":\"3.5.15\"}"
+          if [[ "$BR" == "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64 --skip-images base/base"; else arches="--arches amd64 386 arm64"; fi 
+          echo "${{ gitea.workspace }}/build.py $build_args $arches"
           ${{ gitea.workspace }}/build.py $build_args $arches
         env:
           ORG: ${{ env.ORG }}
           BR: ${{ env.BRANCH }}
+          BUILD_URL: "gitea.basealt.ru/alt"
         continue-on-error: true
       - name: Send notification if build crashed
         if: ${{ steps.build-script.outcome != 'success' }}

.gitea/workflows/wf_single.yaml

@@ -3,13 +3,43 @@ on:
   push:
     tags:
       - '*_*/*_*'
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: "Repository branch"
+        required: true
+        default: sisyphus
+        type: choice
+        options:
+          - sisyphus
+          - p11
+          - p10
+          - c10f2
+      organization:
+        description: "Group of images"
+        required: true
+        default: alt
+        type: choice
+        options:
+          - alt
+          - base
+          - k8s
+          - kubevirt
+      image:
+        description: "Image name"
+        required: true
+        type: string
+      version:
+        description: "Package version"
+        required: false
+        type: string
 
 jobs:
   build-process:
     runs-on: alt-sisyphus
     outputs:
-      branch: ${{ env.BRANCH }}
-      image: ${{ env.IMAGE }}
+      branch: ${{ inputs.branch }}
+      image: ${{ inputs.image }}
       url: ${{ env.URL }}
       repo: ${{ env.REPO }}
       buildres: ${{ steps.build-script.outcome }}
@@ -21,7 +51,7 @@ jobs:
           echo "URL=$repourl" >> ${GITHUB_ENV}
           echo "URL=$repourl"
           reponame=$(echo $GR | cut -d '/' -f 1)
-          echo "REPO=$reponame" >> ${GITHUB_ENV} 
+          echo "REPO=$reponame" >> ${GITHUB_ENV}
           echo "REPO=$reponame"
         env:
           GU: ${{ gitea.server_url }}
@@ -29,7 +59,7 @@ jobs:
       - name: Set repo for c10f2 (Temporary)
         if: ${{ contains(github.ref_name, 'c10f2') }}
         run: |
-          echo "event tag=${{ github.ref_name }}" 
+          echo "event tag=${{ github.ref_name }}"
           echo "10.4.0.3        update.altsp.su" >> /etc/hosts
           echo "cat /etc/hosts"
           cat /etc/hosts
@@ -46,119 +76,96 @@ jobs:
       - name: Login podman gitea
         run: |
           echo "podman login ${{ env.URL }}"
-          podman login --username $P_USER --password $P_PASS ${{ env.URL }}          
+          podman login --username $P_USER --password $P_PASS ${{ env.URL }}
         env:
           P_USER: ${{ secrets.PODMAN_USER }}
           P_PASS: ${{ secrets.PODMAN_PASS }}
       - name: Check files in the repository
         run: |
           ls -a ${{ gitea.workspace }}
-      - name: Parse target branch and tag from events context, save to env                                
-        env:
-          EV: ${{ toJson(gitea.event) }}
-        run: |
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1
-          echo $EV | jq '.ref' -r | sed "s/refs\/tags\//BRANCH=/g" | cut -d '_' -f 1 >> ${GITHUB_ENV}
-          localimage=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 2)
-          echo "IMAGE=$localimage" >> ${GITHUB_ENV}
-          echo "IMAGE=$localimage"
-          org=$(echo "$localimage" | cut -d '/' -f 1)
-          echo "ORG=$org" >> ${GITHUB_ENV}
-          echo "ORG=$org"
-          ver=$(echo $EV | jq '.ref' -r | sed 's/refs\/tags\///g' | cut -d '_' -f 3)
-          echo "VER=$ver" >> ${GITHUB_ENV}
-          echo "VER=$ver"
       - name: Get test for image
         run: |
           if test -f ${{ gitea.workspace }}/org/$IM/test; then testscript=$(cat ${{ gitea.workspace }}/org/$IM/test); else testscript=""; fi
           echo "TEST=$testscript" >> ${GITHUB_ENV}
         env:
-          IM: ${{ env.IMAGE }}
-          BR: ${{ env.BRANCH }}
+          IM: ${{ inputs.organization }}/${{ inputs.image }}
+          BR: ${{ inputs.branch }}
       - name: Run building script
         id: build-script
         run: |
-          if [[ "$IM" == *"k8s"* ]]; then k8sarg="--overwrite-organization $ORG-$BR --package-versions {\"$IM\":\"$VER\"}"; else k8sarg=""; fi
+          if [[ "$IM" == *"k8s"* ]]; then k8sarg="--package-versions {\"$IM\":\"$VER\"}"; else k8sarg=""; fi
           if [[ "$BR" == "sisyphus" ]]; then arches="--arches amd64 386 arm64 loong64"; else arches="--arches amd64 386 arm64"; fi
           echo "build.py -i $IM -b $BR $arches $k8sarg"
-          ${{ gitea.workspace }}/build.py -i $IM -b $BR $arches $k8sarg 
+          ${{ gitea.workspace }}/build.py --skip-stages push -i $IM -b $BR $arches --latest $BR --log-level debug --registry gitea.basealt.ru/alt $k8sarg
         env:
-          IM: ${{ env.IMAGE }}
-          VER: ${{ env.VER }}
-          BR: ${{ env.BRANCH }}
-          ORG: ${{ env.ORG }}
+          IM: ${{ inputs.organization }}/${{ inputs.image }}
+          VER: ${{ inputs.version }}
+          BR: ${{ inputs.branch }}
+          ORG: ${{ inputs.organization }}
         continue-on-error: true
-      - name: Send notification if build crashed
-        if: ${{ steps.build-script.outcome != 'success' }}
-        run: |
-          issueid=1
-          body="Building image $IM finish with some errors."
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid" 
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ env.REPO }}
-          IM: ${{ env.IMAGE }}
-      - name: Delete event tag
-        run: |
-          tagname=$(echo $EV | jq '.ref' -r | sed "s/refs\/tags\///g")
-          curl -X 'DELETE' "$URL/api/v1/repos/$REPO/image-forge/tags/$tagname?token=$T" -H 'accept: application/json' -s
-          echo "tag $tagname is deleted"
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ env.REPO }}
-          EV: ${{ toJson(gitea.event) }}
-  test-process:
-    needs: build-process
-    if: ${{ needs.build-process.outputs.buildres == 'success' }}
-    runs-on: alt-sisyphus
-    steps:
-      - name: Update apt
-        uses: https://gitea.basealt.ru/actions/init-alt-env@v1
-      - name: Install requires
-        run: |
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah curl"
-          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah curl                 
-      - name: Run test
-        id: test-script
-        if: ${{ needs.build-process.outputs.test != '' }}
-        continue-on-error: true
-        run: |
-          if [[ "$IM" == *"k8s"* ]]; then echo "skip tests for k8s images"; else podman run --rm --entrypoint="/bin/sh" $URL/$IM:$BR -c "$TEST"; fi
-        env:
-          IM: ${{ needs.build-process.outputs.image }} 
-          BR: ${{ needs.build-process.outputs.branch }}
-          URL: ${{ needs.build-process.outputs.url }}  
-          REPO: ${{ needs.build-process.outputs.repo }}
-          TEST: ${{ needs.build-process.outputs.test }}
-      - name: Run special test
-        id: special-test
-        if: ${{ needs.build-process.outputs.test == '' }}
-        continue-on-error: true
-        run: |
-          if [[ $IM = 'alt/distroless-true' ]]; then podman run --rm $URL/$IM:$BR true; fi
-          if [[ $IM = 'alt/distroless-gotop' ]]; then podman run --rm $URL/$IM:$BR --version; fi
-        env:
-          IM: ${{ needs.build-process.outputs.image }}
-          BR: ${{ needs.build-process.outputs.branch }}
-          URL: ${{ needs.build-process.outputs.url }}
-          REPO: ${{ needs.build-process.outputs.repo }}
-      - name: Send notification if test crashed
-        if: ${{ steps.test-script.outcome == 'failure' || steps.special-test.outcome == 'failure' }}
-        run: |
-          issueid=1
-          errors=$(cat errors.log)
-          body="Testing image $IM finish with some errors."
-          curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
-          echo "notification about test error is sent to issue $issueid"          
-        env:
-          T: ${{ secrets.TOKEN }}
-          BR: ${{ needs.build-process.outputs.branch }}
-          URL: ${{ gitea.server_url }}
-          REPO: ${{ needs.build-process.outputs.repo }}
-          IM: ${{ needs.build-process.outputs.image }}
-
+      # - name: Send notification if build crashed
+      #   if: ${{ steps.build-script.outcome != 'success' }}
+      #   run: |
+      #     issueid=1
+      #     body="Building image $IM finish with some errors."
+      #     curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
+      #     echo "notification about test error is sent to issue $issueid"
+      #   env:
+      #     T: ${{ secrets.TOKEN }}
+      #     BR: ${{ inputs.branch }}
+      #     URL: ${{ gitea.server_url }}
+      #     REPO: ${{ env.REPO }}
+      #     IM: ${{ inputs.organization }}/${{ inputs.image }}
+      #     EV: ${{ toJson(gitea.event) }}
+  # test-process:
+  #   needs: build-process
+  #   if: ${{ needs.build-process.outputs.buildres == 'success' }}
+  #   runs-on: alt-sisyphus
+  #   steps:
+  #     - name: Update apt
+  #       uses: https://gitea.basealt.ru/actions/init-alt-env@v1
+  #     - name: Install requires
+  #       run: |
+  #         echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah curl"
+  #         apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah curl
+  #     - name: Run test
+  #       id: test-script
+  #       if: ${{ needs.build-process.outputs.test != '' }}
+  #       continue-on-error: true
+  #       run: |
+  #         imname=$(echo "$IM" | cut -d "/" -f2)
+  #         if [[ "$IM" == *"k8s"* ]]; then echo "skip tests for k8s images"; else podman run --rm --entrypoint="/bin/sh" $URL/$REPO/$BR/$imname:latest -c "$TEST"; fi
+  #       env:
+  #         IM: ${{ needs.build-process.outputs.image }}
+  #         BR: ${{ needs.build-process.outputs.branch }}
+  #         URL: ${{ needs.build-process.outputs.url }}
+  #         REPO: ${{ needs.build-process.outputs.repo }}
+  #         TEST: ${{ needs.build-process.outputs.test }}
+  #     - name: Run special test
+  #       id: special-test
+  #       if: ${{ needs.build-process.outputs.test == '' }}
+  #       continue-on-error: true
+  #       run: |
+  #         imname=$(echo "$IM" | cut -d "/" -f2)
+  #         if [[ $IM = 'alt/distroless-true' ]]; then podman run --rm $URL/$REPO/$BR/$imname:latest true; fi
+  #         if [[ $IM = 'alt/distroless-gotop' ]]; then podman run --rm $URL/$REPO/$BR/$imname:latest --version; fi
+  #       env:
+  #         IM: ${{ needs.build-process.outputs.image }}
+  #         BR: ${{ needs.build-process.outputs.branch }}
+  #         URL: ${{ needs.build-process.outputs.url }}
+  #         REPO: ${{ needs.build-process.outputs.repo }}
+  #     - name: Send notification if test crashed
+  #       if: ${{ steps.test-script.outcome == 'failure' || steps.special-test.outcome == 'failure' }}
+  #       run: |
+  #         issueid=1
+  #         errors=$(cat errors.log)
+  #         body="Testing image $IM finish with some errors."
+  #         curl -X 'POST' "$URL/api/v1/repos/$REPO/image-forge/issues/$issueid/comments?token=$T" -H 'accept: application/json' -H 'Content-Type: application/json' -d "{ \"body\": \"$body\" }" -s
+  #         echo "notification about test error is sent to issue $issueid"
+  #       env:
+  #         T: ${{ secrets.TOKEN }}
+  #         BR: ${{ needs.build-process.outputs.branch }}
+  #         URL: ${{ gitea.server_url }}
+  #         REPO: ${{ needs.build-process.outputs.repo }}
+  #         IM: ${{ needs.build-process.outputs.image }}
+  #

README.md

@@ -38,10 +38,12 @@ If you push to the users repository, then organiztion is your username.
   If contains jinja2 template syntax, `--package-version`
   CLI option must be specified.
 
-- `version_template`: **string** (OPTIONAL)
+- `version_template`: **string** or **list of strings** (OPTIONAL)
 
-  template to apply when construction the tag,
-  `version` string variable is available in the template
+  Template to apply when construction the tag,
+  `version` string variable is available in the template.
+  If `version_template` is a list of strings, then the image wiil be tagged
+  with every string in the list.
 
 ### examples
 
@@ -84,6 +86,27 @@ source_packages:
 ./build.py -i k8s/pause
 ```
 
+#### org/alt/etcd
+
+```yaml
+is_versioned: true
+version_template:
+  - "v{{ version }}"
+  - "{{ version }}"
+  - "{{ version }}-0"
+source_packages:
+  - >
+    {% if branch in ["sisyphus", "p11"] %}
+    {% raw %}etcd{{ version }}{% endraw %}
+    {% else %}
+    etcd
+    {% endif %}
+```
+
+```bash
+./build.py -b sisyphus -i alt/etcd --package-version '{"alt/etcd": "3.5.15"}'
+```
+
 ## Dependencies
 On x86_64 machine using p10 branch you need:
 - `python3-module-tomli`

build.py

@@ -3,6 +3,7 @@
 import argparse
 import functools
 import json
+import logging
 import re
 import subprocess
 import textwrap
@@ -14,18 +15,26 @@ from pathlib import Path
 import requests
 import tomli
 import yaml
-from jinja2 import Template
+from jinja2 import Environment, BaseLoader
+
+logger = logging.getLogger(__name__)
 
 ORG_DIR = Path("org")
 
 PKG_VERSIONS: dict | None = None
 
+# Jinja2 custom fail filter
+def fail(message: str):
+    raise ValueError(message)
+
+JINJA_ENV = Environment(loader=BaseLoader())
+JINJA_ENV.filters['fail'] = fail
 
 @dataclass
 class Image:
     canonical_name: str
     is_versioned: bool | None
-    version_template: str | None
+    version_template: list[str] | str | None
     source_packages: list[str] | None
 
     def __init__(self, canonical_name: str):
@@ -91,12 +100,10 @@ def api_get_source_package_version(branch: str, package_name: str) -> str:
     params = {"branch": branch, "name": package_name}
     response = requests.get(api_url, params)
     if response.status_code != 200:
-        print(response)
         api_url = "https://rdb.altlinux.org/api/site/package_versions"
         params = {"arch": "x86_64", "package_type": "source", "name": package_name}
         response = requests.get(api_url, params)
         if response.status_code != 200:
-            print(response)
             raise RuntimeError(
                     f"failed to retrieve source package version: source package {package_name!r}, branch {branch!r} "
             )
@@ -114,6 +121,24 @@ def api_get_source_package_version(branch: str, package_name: str) -> str:
     return result["versions"][0]["version"]
 
 
+def api_get_source_package_version_from_task(task_id: str, package_name: str):
+    api_url = f"https://rdb.altlinux.org/api/task/packages/{task_id}"
+    response = requests.get(api_url)
+    if response.status_code != 200:
+        raise RuntimeError(
+            f"failed to retrieve source package version from task: source package {package_name!r}, task_id {task_id}"
+        )
+
+    result = response.json()
+    for subtask in result["subtasks"]:
+        if subtask["source"]["name"] == package_name:
+            return subtask["source"]["version"]
+
+    raise RuntimeError(
+        f"failed to retrieve source package version from task: source package {package_name!r}, task_id {task_id}"
+    )
+
+
 class Tags:
     def __init__(self, tags_file: str | None, latest: str):
         if tags_file is None:
@@ -122,7 +147,7 @@ class Tags:
             self._tags = tomli.loads(Path(tags_file).read_text())
         self._latest = latest
 
-    def tags(self, branch: str, image: Image):
+    def tags(self, branch: str, image: Image, tasks: Tasks | None = None):
         if self._tags is None:
             if image.is_versioned is None:
                 tags = [branch]
@@ -133,8 +158,7 @@ class Tags:
                 package_name = image.source_packages[0]
 
                 if re.search("{%.*%}", package_name):
-                    package_name = Template(package_name).render(branch=branch).strip()
-                    print(f"{package_name=}")
+                    package_name = JINJA_ENV.from_string(package_name).render(branch=branch).strip()
 
                 if re.search("{{.*}}", package_name):
                     if PKG_VERSIONS is None:
@@ -152,23 +176,58 @@ class Tags:
                             f"invalid version for image {image.canonical_name!r}: {PKG_VERSIONS[image.canonical_name]!r}"
                         )
 
-                    package_name = Template(package_name).render(
+                    package_name = JINJA_ENV.from_string(package_name).render(
                         version=PKG_VERSIONS[image.canonical_name]
                     )
-                version = api_get_source_package_version(branch, package_name)
 
-                if image.version_template is not None:
-                    version = (
-                        Template(image.version_template).render(version=version).strip()
+                if tasks is not None:
+                    task_ids = tasks.get(branch, image)
+                else:
+                    task_ids = []
+
+                if task_ids:
+                    logger.info(
+                        "getting %s package version from task %s",
+                        package_name,
+                        task_ids[0],
                     )
+                    version = api_get_source_package_version_from_task(
+                        task_ids[0], package_name
+                    )
+                else:
+                    logger.info(
+                        "getting %s package version from repo %s",
+                        package_name,
+                        branch,
+                    )
+                    version = api_get_source_package_version(branch, package_name)
+
+                tags = []
+                if image.version_template is not None:
+                    if isinstance(image.version_template, str):
+                        version_tag = (
+                            JINJA_ENV.from_string(image.version_template).render(version=version).strip()
+                        )
+                        tags.append(version_tag)
+                    elif isinstance(image.version_template, list):
+                        for v in image.version_template:
+                            version_tag = (
+                                JINJA_ENV.from_string(v).render(version=version).strip()
+                            )
+                            tags.append(version_tag)
+                    else:
+                        raise RuntimeError(f"expected type for version_template: 'str' or 'list[str]', got '{type(image.version_template)}' for image {image}")
+                else:
+                    tags.append(version)
 
-                tags = [version]
                 tags.append("latest")
             else:
                 version = datetime.now().strftime('%Y%m%d')
                 if image.version_template is not None:
+                    if not isinstance(image.version_template, str):
+                        raise RuntimeError(f"expected type for version_template: 'str', got '{type(image.version_template)}' for image {image}")
                     version = (
-                        Template(image.version_template).render(version=version).strip()
+                        JINJA_ENV.from_string(image.version_template).render(version=version).strip()
                     )
                 tags = [version]
                 tags.append("latest")
@@ -349,7 +408,7 @@ class DockerBuilder:
         else:
             registry = ""
             alt_image = "alt"
-        rendered = Template(template).render(
+        rendered = JINJA_ENV.from_string(template).render(
             alt_image=alt_image,
             branch=self.branch,
             install_packages=install_packages,
@@ -455,6 +514,8 @@ class DockerBuilder:
             pre_cmd = ["echo"]
         else:
             pre_cmd = []
+
+        logger.debug("run: %s", pre_cmd + cmd)
         subprocess.run(pre_cmd + cmd, *args, **kwargs)
 
     def distroless_build(self, image: Image, arches):
@@ -652,7 +713,7 @@ class DockerBuilder:
             self.images_info.skip_arches(image.canonical_name)
         )
         platforms = ",".join([f"linux/{a}" for a in build_arches])
-        tags = self.tags.tags(self.branch, image)
+        tags = self.tags.tags(self.branch, image, self.tasks)
         manifest = self.render_full_tag(image, tags[0])
 
         msg = "Building image {} for {} arches".format(
@@ -712,7 +773,7 @@ class DockerBuilder:
         if self.images_info.skip_branch(image.canonical_name, self.branch):
             return
 
-        tags = self.tags.tags(self.branch, image)
+        tags = self.tags.tags(self.branch, image, self.tasks)
         manifests = [self.render_full_tag(image, t) for t in tags]
 
         for manifest in manifests:
@@ -765,6 +826,8 @@ def parse_args():
     images = [f"{o.name}/{i.name}" for o in organizations for i in o.iterdir()]
     organizations = [o.name for o in organizations]
 
+    log_levels = ["debug", "info", "warning", "error", "critical"]
+
     parser = argparse.ArgumentParser(
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
@@ -875,6 +938,12 @@ def parse_args():
         type=json.loads,
         help="json string where key is image name, value is the package version",
     )
+    parser.add_argument(
+        "--log-level",
+        default="warning",
+        choices=log_levels,
+        help="log messages above specified level",
+    )
     args = parser.parse_args()
 
     args.stages = set(args.stages) - set(args.skip_stages)
@@ -890,6 +959,14 @@ def main():
 
     args = parse_args()
     PKG_VERSIONS = args.package_versions
+
+    numeric_level = getattr(logging, args.log_level.upper(), logging.WARNING)
+    logging.basicConfig(
+        level=numeric_level, format="%(asctime)s - %(levelname)s\t- %(message)s"
+    )
+
+    logger.info("PKG_VERSIONS=%s", PKG_VERSIONS)
+
     arches = args.arches
     images_info = ImagesInfo()
     tags = Tags(args.tags, args.latest)

images-info.toml

@@ -9,3 +9,6 @@ skip-arches = [ "386" ]
 
 ["alt/ansible"]
 skip-branches = [ "c10f2", "c10f1", "p10" ]
+
+["alt/buildkit"]
+skip-branches = [ "c10f1", "p10" ]

org/alt/buildkit/Dockerfile.template

@@ -0,0 +1,16 @@
+FROM {{ registry }}{{ branch }}/base:latest
+
+MAINTAINER alt-cloud
+
+LABEL org.opencontainers.image.title="buildkit"
+LABEL org.opencontainers.image.description="Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"
+LABEL org.opencontainers.image.source="https://github.com/moby/buildkit"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+LABEL org.opencontainers.image.vendor="ALT Linux Team"
+
+{{ install_packages(
+    "ca-certificates",
+    "buildkit"
+) }}
+
+ENTRYPOINT ["/usr/bin/buildkitd"]

org/alt/buildkit/info.yaml

@@ -0,0 +1,6 @@
+---
+is_versioned: true
+version_template: "{{ version }}"
+source_packages:
+  - buildkit
+...

org/alt/buildkit/test

@@ -0,0 +1 @@
+buildkitd --version

org/alt/etcd/Dockerfile.template

@@ -8,7 +8,13 @@ LABEL org.opencontainers.image.source="https://github.com/etcd-io/etcd"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
+{% if branch in ["sisyphus"] %}
+ARG PKG_VERSION
+
+{{ install_packages("etcd${PKG_VERSION}") }}
+{% else %}
 {{ install_packages("etcd") }}
+{% endif %}
 
 RUN ln -s /usr/sbin/etcd /usr/local/bin/etcd
 

org/alt/etcd/info.yaml

@@ -1,6 +1,14 @@
 ---
 is_versioned: true
-version_template: "{{ version }}"
+version_template:
+  - "v{{ version }}"
+  - "{{ version }}"
+  - "{{ version }}-0"
 source_packages:
-  - etcd
+  - >
+    {% if branch in ["sisyphus"] %}
+    {% raw %}etcd{{ version }}{% endraw %}
+    {% else %}
+    etcd
+    {% endif %}
 ...

org/alt/etcd/test

@@ -1 +1 @@
-etcdctl version
+etcd --version

org/alt/nginx/Dockerfile.template

@@ -15,7 +15,7 @@ RUN cd /etc/nginx/sites-enabled.d && ln -s ../sites-available.d/default.conf .
 RUN ln -sf /dev/stdout /var/log/nginx/access.log
 RUN ln -sf /dev/stderr /var/log/nginx/error.log
 
-RUN sed -Ei 's/^([[:space:]]*listen[[:space:]]+)localhost(:80)/\10.0.0.0\2/' \
+RUN sed -Ei 's/^([[:space:]]*listen[[:space:]]+)(localhost|127.0.0.1)(:80)/\10.0.0.0\3/' \
             /etc/nginx/sites-available.d/default.conf
 
 EXPOSE 80

org/k8s/etcd/Dockerfile.template

@@ -1,17 +0,0 @@
-FROM {{ registry }}{{ branch }}/{{ alt_image }}:latest
-
-MAINTAINER alt-cloud
-
-LABEL org.opencontainers.image.title="etcd"
-LABEL org.opencontainers.image.description="Distributed reliable key-value store for the most critical data of a distributed system"
-LABEL org.opencontainers.image.source="https://github.com/etcd-io/etcd"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-LABEL org.opencontainers.image.vendor="ALT Linux Team"
-
-{{ install_packages("etcd") }}
-
-RUN ln -s /usr/sbin/etcd /usr/local/bin/etcd
-
-VOLUME /data
-
-ENTRYPOINT ["/usr/sbin/etcd", "--data-dir", "/data"]

org/k8s/etcd/info.yaml

@@ -1,12 +0,0 @@
----
-is_versioned: true
-version_template: >
-  {% set version_patch = version.split(".")[2] | int %}
-  {% if version_patch < 16 %}
-    {{ version }}-0
-  {% else %}
-    v{{ version }}
-  {% endif %}
-source_packages:
-  - etcd
-...

org/k8s/etcd/test

@@ -1 +0,0 @@
-etcd --version

org/k8s/flannel-cni-plugin/info.yaml

@@ -1,6 +1,18 @@
 ---
 is_versioned: true
-version_template: v{{ version.rsplit('.', 1) | first  }}-flannel{{ version.rsplit('.', 1) | last }}
+version_template: >-
+  {%- set version_parts = version.split('.') -%}
+  {%- if version_parts | length == 3 -%}
+    {%- if version == "1.4.0" -%}
+    v{{ version }}-flannel1
+    {%- else -%}
+    v{{ version }}
+    {%- endif %}
+  {%- elif version_parts | length == 4 -%}
+    v{{ version.rsplit('.', 1) | first }}-flannel{{ version.rsplit('.', 1) | last }}
+  {%- else -%}
+    {{ "Invalid version format: must have 3 or 4 parts" | fail }}
+  {%- endif %}
 source_packages:
   - cni-plugin-flannel
 ...