test

.gitea/workflows/wf_full.yaml

@@ -43,17 +43,6 @@ 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: Check out current repo
-        uses: actions/checkout@v4
-      - name: Change vendor label for c10f
-        if: ${{ contains(github.ref_name, 'c10f') }}
-        run: |
-          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:"
-          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:
-          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:"
-          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:
-        env:
-          ORG: ${{ env.ORG }}
       - name: Set repo for c10f2 (Temporary)
         if: ${{ contains(github.ref_name, 'c10f2') }}
         run: |
@@ -61,6 +50,8 @@ jobs:
           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 }}"

.gitea/workflows/wf_multiple.yaml

@@ -1,199 +0,0 @@
-name: Building alt images
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  build-process:
-    runs-on: alt-sisyphus
-    outputs:
-      branch: ${{ env.BRANCH }}
-      image: ${{ env.IMAGE }}
-      url: ${{ env.URL }}
-      repo: ${{ env.REPO }}
-      buildres: ${{ steps.build-script.outcome }}
-      test: ${{ env.TEST }}
-    steps:
-      - name: Check workspace
-        run: |
-          repourl=$(echo $GU | cut -d '/' -f 3)
-          echo "URL=$repourl" >> ${GITHUB_ENV}
-          echo "URL=$repourl"
-          reponame=$(echo $GR | cut -d '/' -f 1)
-          echo "REPO=$reponame" >> ${GITHUB_ENV}
-          echo "REPO=$reponame"
-        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: Login podman gitea
-        run: |
-          echo "podman login ${{ 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: |
-          branch="$(echo $EV | jq '.ref' -r | sed "s|refs/tags/||g" | cut -d '_' -f 1)"
-          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}
-
-          rest="$(echo $EV | jq '.ref' -r | sed "s|refs/tags/|BRANCH=|g" | cut -d '_' -f 1-)"
-
-          IFS='_' read -ra parts <<< "$rest"
-
-          images=()
-          declare -A versions
-
-          for part in "${parts[@]}"; do
-              image="${part%@*}"
-              version="${part#*@}"
-              images+=("$image")
-              versions["$image"]="$version"
-          done
-
-          image_args="${images[*]}"
-
-          # Build JSON for package-versions
-          package_versions="{"
-          for i in "${!images[@]}"; do
-              img="${images[$i]}"
-              ver="${versions[$img]}"
-              sep=$([[ $i -lt $((${#images[@]} - 1)) ]] && echo "," || echo "")
-              package_versions+="\"$img\": \"$ver\"$sep"
-          done
-          package_versions+="}"
-
-          echo "IMAGES=$image_args" >> $GITEA_OUTPUT
-          echo "PACKAGE_VERSIONS=$package_versions" >> $GITEA_OUTPUT
-      - name: Change vendor label for c10f
-        if: ${{ contains(github.ref_name, 'c10f') }}
-        run: |
-          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:"
-          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:
-          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:"
-          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:
-        env:
-          ORG: ${{ env.ORG }}
-      - 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 }}
-      - name: Run building script
-        id: build-script
-        run: |
-          ${{ gitea.workspace }}/build.py \
-            --log-level debug \
-            --skip-stages push \
-            --branch $BRANCH \
-            --registry gitea.basealt.ru/alt \
-            --arches amd64 \
-            -i $IMAGES \
-            --package-versions "$PACKAGE_VERSIONS"
-        env:
-          BRANCH: ${{ env.BRANCH }}
-          IMAGES: ${{ env.IMAGES }}
-          PACKAGE_VERSIONS: ${{ env.PACKAGE_VERSIONS }}
-        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: |
-          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 }}
-

.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 }}
+      branch: ${{ inputs.branch }}
-      image: ${{ env.IMAGE }}
+      image: ${{ inputs.image }}
       url: ${{ env.URL }}
       repo: ${{ env.REPO }}
       buildres: ${{ steps.build-script.outcome }}
@@ -53,123 +83,89 @@ jobs:
       - 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: Change vendor label for c10f
-        if: ${{ contains(github.ref_name, 'c10f') }}
-        run: |
-          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:"
-          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/Dockerfile.template ||:
-          echo "sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:"
-          sed -i 's/ALT Linux Team/BaseALT LLC/g' ${{ gitea.workspace }}/org/$ORG/*/distroless.toml ||:
-        env:
-          ORG: ${{ env.ORG }}
       - 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 }}
+          IM: ${{ inputs.organization }}/${{ inputs.image }}
-          BR: ${{ env.BRANCH }}
+          BR: ${{ inputs.branch }}
       - name: Run building script
         id: build-script
         run: |
           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 --latest $BR --log-level debug --registry gitea.basealt.ru/alt $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 }}
+          IM: ${{ inputs.organization }}/${{ inputs.image }}
-          VER: ${{ env.VER }}
+          VER: ${{ inputs.version }}
-          BR: ${{ env.BRANCH }}
+          BR: ${{ inputs.branch }}
-          ORG: ${{ env.ORG }}
+          ORG: ${{ inputs.organization }}
         continue-on-error: true
-      - name: Send notification if build crashed
+      # - name: Send notification if build crashed
-        if: ${{ steps.build-script.outcome != 'success' }}
+      #   if: ${{ steps.build-script.outcome != 'success' }}
-        run: |
+      #   run: |
-          issueid=1
+      #     issueid=1
-          body="Building image $IM finish with some errors."
+      #     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
+      #     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"
+      #     echo "notification about test error is sent to issue $issueid"
-        env:
+      #   env:
-          T: ${{ secrets.TOKEN }}
+      #     T: ${{ secrets.TOKEN }}
-          BR: ${{ env.BRANCH }}
+      #     BR: ${{ inputs.branch }}
-          URL: ${{ gitea.server_url }}
+      #     URL: ${{ gitea.server_url }}
-          REPO: ${{ env.REPO }}
+      #     REPO: ${{ env.REPO }}
-          IM: ${{ env.IMAGE }}
+      #     IM: ${{ inputs.organization }}/${{ inputs.image }}
-      - name: Delete event tag
+      #     EV: ${{ toJson(gitea.event) }}
-        run: |
+  # test-process:
-          tagname=$(echo $EV | jq '.ref' -r | sed "s/refs\/tags\///g")
+  #   needs: build-process
-          curl -X 'DELETE' "$URL/api/v1/repos/$REPO/image-forge/tags/$tagname?token=$T" -H 'accept: application/json' -s
+  #   if: ${{ needs.build-process.outputs.buildres == 'success' }}
-          echo "tag $tagname is deleted"
+  #   runs-on: alt-sisyphus
-        env:
+  #   steps:
-          T: ${{ secrets.TOKEN }}
+  #     - name: Update apt
-          BR: ${{ env.BRANCH }}
+  #       uses: https://gitea.basealt.ru/actions/init-alt-env@v1
-          URL: ${{ gitea.server_url }}
+  #     - name: Install requires
-          REPO: ${{ env.REPO }}
+  #       run: |
-          EV: ${{ toJson(gitea.event) }}
+  #         echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah curl"
-  test-process:
+  #         apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah curl
-    needs: build-process
+  #     - name: Run test
-    if: ${{ needs.build-process.outputs.buildres == 'success' }}
+  #       id: test-script
-    runs-on: alt-sisyphus
+  #       if: ${{ needs.build-process.outputs.test != '' }}
-    steps:
+  #       continue-on-error: true
-      - name: Update apt
+  #       run: |
-        uses: https://gitea.basealt.ru/actions/init-alt-env@v1
+  #         imname=$(echo "$IM" | cut -d "/" -f2)
-      - name: Install requires
+  #         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
-        run: |
+  #       env:
-          echo "apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah curl"
+  #         IM: ${{ needs.build-process.outputs.image }}
-          apt-get install -y python3-module-tomli python3-module-jinja2 podman buildah curl
+  #         BR: ${{ needs.build-process.outputs.branch }}
-      - name: Run test
+  #         URL: ${{ needs.build-process.outputs.url }}
-        id: test-script
+  #         REPO: ${{ needs.build-process.outputs.repo }}
-        if: ${{ needs.build-process.outputs.test != '' }}
+  #         TEST: ${{ needs.build-process.outputs.test }}
-        continue-on-error: true
+  #     - name: Run special test
-        run: |
+  #       id: special-test
-          imname=$(echo "$IM" | cut -d "/" -f2)
+  #       if: ${{ needs.build-process.outputs.test == '' }}
-          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
+  #       continue-on-error: true
-        env:
+  #       run: |
-          IM: ${{ needs.build-process.outputs.image }}
+  #         imname=$(echo "$IM" | cut -d "/" -f2)
-          BR: ${{ needs.build-process.outputs.branch }}
+  #         if [[ $IM = 'alt/distroless-true' ]]; then podman run --rm $URL/$REPO/$BR/$imname:latest true; fi
-          URL: ${{ needs.build-process.outputs.url }}
+  #         if [[ $IM = 'alt/distroless-gotop' ]]; then podman run --rm $URL/$REPO/$BR/$imname:latest --version; fi
-          REPO: ${{ needs.build-process.outputs.repo }}
+  #       env:
-          TEST: ${{ needs.build-process.outputs.test }}
+  #         IM: ${{ needs.build-process.outputs.image }}
-      - name: Run special test
+  #         BR: ${{ needs.build-process.outputs.branch }}
-        id: special-test
+  #         URL: ${{ needs.build-process.outputs.url }}
-        if: ${{ needs.build-process.outputs.test == '' }}
+  #         REPO: ${{ needs.build-process.outputs.repo }}
-        continue-on-error: true
+  #     - name: Send notification if test crashed
-        run: |
+  #       if: ${{ steps.test-script.outcome == 'failure' || steps.special-test.outcome == 'failure' }}
-          imname=$(echo "$IM" | cut -d "/" -f2)
+  #       run: |
-          if [[ $IM = 'alt/distroless-true' ]]; then podman run --rm $URL/$REPO/$BR/$imname:latest true; fi
+  #         issueid=1
-          if [[ $IM = 'alt/distroless-gotop' ]]; then podman run --rm $URL/$REPO/$BR/$imname:latest --version; fi
+  #         errors=$(cat errors.log)
-        env:
+  #         body="Testing image $IM finish with some errors."
-          IM: ${{ needs.build-process.outputs.image }}
+  #         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
-          BR: ${{ needs.build-process.outputs.branch }}
+  #         echo "notification about test error is sent to issue $issueid"
-          URL: ${{ needs.build-process.outputs.url }}
+  #       env:
-          REPO: ${{ needs.build-process.outputs.repo }}
+  #         T: ${{ secrets.TOKEN }}
-      - name: Send notification if test crashed
+  #         BR: ${{ needs.build-process.outputs.branch }}
-        if: ${{ steps.test-script.outcome == 'failure' || steps.special-test.outcome == 'failure' }}
+  #         URL: ${{ gitea.server_url }}
-        run: |
+  #         REPO: ${{ needs.build-process.outputs.repo }}
-          issueid=1
+  #         IM: ${{ needs.build-process.outputs.image }}
-          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

@@ -86,7 +86,7 @@ source_packages:
 ./build.py -i k8s/pause
 ```
 
-#### org/k8s/etcd
+#### org/alt/etcd
 
 ```yaml
 is_versioned: true
@@ -95,11 +95,16 @@ version_template:
   - "{{ version }}"
   - "{{ version }}-0"
 source_packages:
-  - etcd-for-kubernetes{{ version }}
+  - >
+    {% if branch in ["sisyphus", "p11"] %}
+    {% raw %}etcd{{ version }}{% endraw %}
+    {% else %}
+    etcd
+    {% endif %}
 ```
 
 ```bash
-./build.py -b sisyphus -i k8s/etcd --package-version '{"k8s/etcd": "1.32"}'
+./build.py -b sisyphus -i alt/etcd --package-version '{"alt/etcd": "3.5.15"}'
 ```
 
 ## Dependencies

build.py

@@ -11,7 +11,6 @@ from datetime import datetime
 from dataclasses import dataclass
 from graphlib import TopologicalSorter
 from pathlib import Path
-from typing import Optional, Union
 
 import requests
 import tomli
@@ -22,7 +21,7 @@ logger = logging.getLogger(__name__)
 
 ORG_DIR = Path("org")
 
-PKG_VERSIONS: Optional[dict] = None
+PKG_VERSIONS: dict | None = None
 
 # Jinja2 custom fail filter
 def fail(message: str):
@@ -34,9 +33,9 @@ JINJA_ENV.filters['fail'] = fail
 @dataclass
 class Image:
     canonical_name: str
-    is_versioned: Optional[bool]
+    is_versioned: bool | None
-    version_template: Union[list[str], str, None]
+    version_template: list[str] | str | None
-    source_packages: Optional[list[str]]
+    source_packages: list[str] | None
 
     def __init__(self, canonical_name: str):
         self.canonical_name = canonical_name
@@ -141,14 +140,14 @@ def api_get_source_package_version_from_task(task_id: str, package_name: str):
 
 
 class Tags:
-    def __init__(self, tags_file: Optional[str], latest: str):
+    def __init__(self, tags_file: str | None, latest: str):
         if tags_file is None:
             self._tags = None
         else:
             self._tags = tomli.loads(Path(tags_file).read_text())
         self._latest = latest
 
-    def tags(self, branch: str, image: Image, tasks: Optional[Tasks] = None):
+    def tags(self, branch: str, image: Image, tasks: Tasks | None = None):
         if self._tags is None:
             if image.is_versioned is None:
                 tags = [branch]
@@ -158,7 +157,9 @@ class Tags:
             elif image.is_versioned and image.source_packages:
                 package_name = image.source_packages[0]
 
-                context_version = ""
+                if re.search("{%.*%}", package_name):
+                    package_name = JINJA_ENV.from_string(package_name).render(branch=branch).strip()
+
                 if re.search("{{.*}}", package_name):
                     if PKG_VERSIONS is None:
                         raise RuntimeError(
@@ -175,12 +176,8 @@ class Tags:
                             f"invalid version for image {image.canonical_name!r}: {PKG_VERSIONS[image.canonical_name]!r}"
                         )
 
-                    context_version = PKG_VERSIONS[image.canonical_name]
-
-                if re.search("{%.*%}", package_name) or re.search("{{.*}}", package_name):
                     package_name = JINJA_ENV.from_string(package_name).render(
-                        branch=branch,
+                        version=PKG_VERSIONS[image.canonical_name]
-                        version=context_version,
                     )
 
                 if tasks is not None:
@@ -417,7 +414,6 @@ class DockerBuilder:
             install_packages=install_packages,
             organization=organization,
             registry=registry,
-            pkg_versions=PKG_VERSIONS,
             **kwargs,
         )
 
@@ -666,7 +662,7 @@ class DockerBuilder:
         build_arches = set(arches) - set(
             self.images_info.skip_arches(image.canonical_name)
         )
-        tags = self.tags.tags(self.branch, image, self.tasks)
+        tags = self.tags.tags(self.branch, image)
         manifest = self.render_full_tag(image, tags[0])
 
         msg = "Building image {} for {} arches".format(

org/alt/etcd/Dockerfile.template

@@ -8,13 +8,15 @@ 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-for-kubernetes${PKG_VERSION}") }}
+{{ install_packages("etcd${PKG_VERSION}") }}
+{% else %}
+{{ install_packages("etcd") }}
+{% endif %}
 
-RUN ln -s /usr/sbin/etcd /usr/local/bin/etcd && ln -s /usr/bin/etcdctl /usr/local/bin/etcdctl
+RUN ln -s /usr/sbin/etcd /usr/local/bin/etcd
-
-EXPOSE 2379 2380
 
 VOLUME /data
 

org/alt/etcd/README.md

@@ -0,0 +1,13 @@
+dockerfiles-alt-etcd
+=========================
+
+ALT dockerfile for etcd.
+
+Copy Dockerfile somewhere and build the image:
+`$ docker build --rm -t <username>/etcd.`
+
+And launch the etcd container:
+`docker run -d -v <etcd data dir>:/data <username>/etcd`
+
+If etcdclt watnted it could be run via:
+`docker run --entrypoint etcdctl <username>/etcd`

org/alt/etcd/info.yaml

@@ -5,5 +5,10 @@ version_template:
   - "{{ version }}"
   - "{{ version }}-0"
 source_packages:
-  - etcd-for-kubernetes{{ version }}
+  - >
+    {% if branch in ["sisyphus"] %}
+    {% raw %}etcd{{ version }}{% endraw %}
+    {% else %}
+    etcd
+    {% endif %}
 ...

org/alt/etcd/test

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

org/alt/php/info.yaml

@@ -3,9 +3,9 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
   - >
-    {%- if branch in [ "p10", "c10f1", "c10f2"] -%}
+    {% if branch in [ "p10", "c10f1", "c10f2"] %}
-    php8.2
+    {% raw %}php8.2{% endraw %}
-    {%- else -%}
+    {% else %}
     php8.3
-    {%- endif -%}
+    {% endif %}
 ...

org/alt/ruby/info.yaml

@@ -3,9 +3,9 @@ is_versioned: true
 version_template: "{{ version }}"
 source_packages:
   - >
-    {%- if branch in ["p10", "c10f2", "c10f1"] -%}
+    {% if branch in ["p10", "c10f2", "c10f1"] %}
-    ruby
+    {% raw %}ruby{% endraw %}
-    {%- else -%}
+    {% else %}
     gem-irb
-    {%- endif -%}
+    {% endif %}
 ...

org/k8s/coredns/Dockerfile.template

@@ -8,16 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/coredns/coredns"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
-{% if pkg_versions and "k8s/coredns" in pkg_versions %}
+{% if branch in ["sisyphus", "p11", "c10f2"] %}
-{% set version_parts = pkg_versions["k8s/coredns"].split('.') | length %}
-{% else %}
-{% set version_parts = 0 %}
-{% endif %}
-{% if branch in ["sisyphus"] and version_parts == 2 %}
-ARG PKG_VERSION
-
-{{ install_packages("coredns-for-kubernetes${PKG_VERSION}") }}
-{% elif branch in ["sisyphus", "p11", "c10f2"] and version_parts == 3 %}
 ARG PKG_VERSION
 
 {{ install_packages("coredns${PKG_VERSION}") }}

org/k8s/coredns/info.yaml

@@ -3,13 +3,9 @@ is_versioned: true
 version_template: v{{ version }}
 source_packages:
   - >
-    {%- set version_parts = version.split('.') -%}
+    {% if branch in ["sisyphus", "p11", "c10f2"] %}
-    {%- set version_major = version_parts[1] | int -%}
+    {% raw %}coredns{{ version }}{% endraw %}
-    {%- if branch in ["sisyphus"] and version_parts | length == 2 and version_major >= 33 -%}
+    {% else %}
-    coredns-for-kubernetes{{ version }}
-    {%- elif branch in ["sisyphus", "p11", "c10f2"] -%}
-    coredns{{ version }}
-    {%- else -%}
     coredns
-    {%- endif -%}
+    {% endif %}
 ...

org/k8s/etcd/README.md

@@ -1,19 +0,0 @@
-dockerfiles-alt-etcd
-=========================
-
-ALT dockerfile for etcd.
-
-Copy Dockerfile somewhere and build the image:
-```console
-$ podman build --rm -t <username>/etcd.
-```
-
-And launch the etcd container:
-```console
-$ podman run -d -v <etcd data dir>:/data <username>/etcd
-```
-
-If etcdclt is wanted, it could be run via:
-```console
-$ podman run --entrypoint etcdctl <username>/etcd
-```

org/k8s/etcd/test

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