diff --git a/.github/workflow_templates/build-and-test_dev.yml b/.github/workflow_templates/build-and-test_dev.yml
index 3ad1c1ef43..d63892ad26 100644
--- a/.github/workflow_templates/build-and-test_dev.yml
+++ b/.github/workflow_templates/build-and-test_dev.yml
@@ -170,7 +170,7 @@ jobs:
- git_info
- pull_request_info
- build_deckhouse
-{!{ tmpl.Exec "tests_before_build_template" (slice $ctx "dmtlint") | strings.Indent 4 }!}
+{!{ tmpl.Exec "tests_template" (slice $ctx "dmtlint" "build_deckhouse") | strings.Indent 4 }!}
dhctl_tests:
if: ${{ needs.pull_request_info.outputs.changes_not_markdown == 'true' }}
diff --git a/.github/workflow_templates/build-and-test_pre-release.yml b/.github/workflow_templates/build-and-test_pre-release.yml
index 079cdfe080..7f08841081 100644
--- a/.github/workflow_templates/build-and-test_pre-release.yml
+++ b/.github/workflow_templates/build-and-test_pre-release.yml
@@ -97,7 +97,7 @@ jobs:
needs:
- git_info
- build_deckhouse
-{!{ tmpl.Exec "tests_before_build_template" (slice $ctx "dmtlint") | strings.Indent 4 }!}
+{!{ tmpl.Exec "tests_template" (slice $ctx "dmtlint" "build_deckhouse") | strings.Indent 4 }!}
dhctl_tests:
name: Dhctl Tests
diff --git a/.github/workflow_templates/build-and-test_release.yml b/.github/workflow_templates/build-and-test_release.yml
index 2f9f0e290b..47871744c2 100644
--- a/.github/workflow_templates/build-and-test_release.yml
+++ b/.github/workflow_templates/build-and-test_release.yml
@@ -248,8 +248,8 @@ jobs:
name: DMT Lint
needs:
- git_info
- - build_deckhouse
-{!{ tmpl.Exec "tests_before_build_template" (slice $ctx "dmtlint") | strings.Indent 4 }!}
+ - build_fe
+{!{ tmpl.Exec "tests_template" (slice $ctx "dmtlint" "build_deckhouse") | strings.Indent 4 }!}
{!{ tmpl.Exec "update_comment_on_finish" (slice "job,one-line" $jobNames.matrix_tests) | strings.Indent 6 }!}
{!{ $jobNames = coll.Merge $jobNames (dict "dhctl_tests" "Dhctl Tests") }!}
diff --git a/.github/workflows/build-and-test_dev.yml b/.github/workflows/build-and-test_dev.yml
index 0474c310d8..08d301e18f 100644
--- a/.github/workflows/build-and-test_dev.yml
+++ b/.github/workflows/build-and-test_dev.yml
@@ -1159,7 +1159,7 @@ jobs:
- pull_request_info
- build_deckhouse
- #
+ #
runs-on: [self-hosted, regular]
steps:
@@ -1228,15 +1228,23 @@ jobs:
#
- name: Run tests
env:
- TESTS_IMAGE_NAME: "registry.deckhouse.io/base_images/golang:1.23.1-bullseye@sha256:a24507d1a36fce86431198a979435dadb187e8d0ce0b5c181f46d6788d84a40f"
+ TESTS_IMAGE_NAME: ${{needs.build_deckhouse.outputs.tests_image_name}}
run: |
+ if [[ -z ${TESTS_IMAGE_NAME} ]] ; then
+ echo "TESTS_IMAGE_NAME is empty"
+ exit 1
+ fi
+
+ # Decode image name from gzip+base64.
+ TESTS_IMAGE_NAME=$(echo ${TESTS_IMAGE_NAME} | base64 -d | gunzip)
+
# Print image name in uppercase to prevent hiding non-secret registry host stored in secret.
echo "Tests image name: '${TESTS_IMAGE_NAME}'" | tr '[:lower:]' '[:upper:]'
echo "⚓️ 📥 [$(date -u)] Pull 'tests' image..."
docker pull ${TESTS_IMAGE_NAME}
echo "⚓️ 🏎 [$(date -u)] Run tests..."
docker run -w /deckhouse -v ${{github.workspace}}:/deckhouse -e "TERM=xterm-256color" -v ~/go-pkg-cache:/go/pkg ${TESTS_IMAGE_NAME} dmt lint -l INFO /modules
- #
+ #
dhctl_tests:
if: ${{ needs.pull_request_info.outputs.changes_not_markdown == 'true' }}
diff --git a/.github/workflows/build-and-test_pre-release.yml b/.github/workflows/build-and-test_pre-release.yml
index 4a08cac275..571b0990ab 100644
--- a/.github/workflows/build-and-test_pre-release.yml
+++ b/.github/workflows/build-and-test_pre-release.yml
@@ -875,7 +875,7 @@ jobs:
- git_info
- build_deckhouse
- #
+ #
runs-on: [self-hosted, regular]
steps:
@@ -943,15 +943,23 @@ jobs:
#
- name: Run tests
env:
- TESTS_IMAGE_NAME: "registry.deckhouse.io/base_images/golang:1.23.1-bullseye@sha256:a24507d1a36fce86431198a979435dadb187e8d0ce0b5c181f46d6788d84a40f"
+ TESTS_IMAGE_NAME: ${{needs.build_deckhouse.outputs.tests_image_name}}
run: |
+ if [[ -z ${TESTS_IMAGE_NAME} ]] ; then
+ echo "TESTS_IMAGE_NAME is empty"
+ exit 1
+ fi
+
+ # Decode image name from gzip+base64.
+ TESTS_IMAGE_NAME=$(echo ${TESTS_IMAGE_NAME} | base64 -d | gunzip)
+
# Print image name in uppercase to prevent hiding non-secret registry host stored in secret.
echo "Tests image name: '${TESTS_IMAGE_NAME}'" | tr '[:lower:]' '[:upper:]'
echo "⚓️ 📥 [$(date -u)] Pull 'tests' image..."
docker pull ${TESTS_IMAGE_NAME}
echo "⚓️ 🏎 [$(date -u)] Run tests..."
docker run -w /deckhouse -v ${{github.workspace}}:/deckhouse -e "TERM=xterm-256color" -v ~/go-pkg-cache:/go/pkg ${TESTS_IMAGE_NAME} dmt lint -l INFO /modules
- #
+ #
dhctl_tests:
name: Dhctl Tests
diff --git a/.github/workflows/build-and-test_release.yml b/.github/workflows/build-and-test_release.yml
index 38131a01dc..f6a5541c86 100644
--- a/.github/workflows/build-and-test_release.yml
+++ b/.github/workflows/build-and-test_release.yml
@@ -3109,9 +3109,9 @@ jobs:
name: DMT Lint
needs:
- git_info
- - build_deckhouse
+ - build_fe
- #
+ #
runs-on: [self-hosted, regular]
steps:
@@ -3179,15 +3179,23 @@ jobs:
#
- name: Run tests
env:
- TESTS_IMAGE_NAME: "registry.deckhouse.io/base_images/golang:1.23.1-bullseye@sha256:a24507d1a36fce86431198a979435dadb187e8d0ce0b5c181f46d6788d84a40f"
+ TESTS_IMAGE_NAME: ${{needs.build_deckhouse.outputs.tests_image_name}}
run: |
+ if [[ -z ${TESTS_IMAGE_NAME} ]] ; then
+ echo "TESTS_IMAGE_NAME is empty"
+ exit 1
+ fi
+
+ # Decode image name from gzip+base64.
+ TESTS_IMAGE_NAME=$(echo ${TESTS_IMAGE_NAME} | base64 -d | gunzip)
+
# Print image name in uppercase to prevent hiding non-secret registry host stored in secret.
echo "Tests image name: '${TESTS_IMAGE_NAME}'" | tr '[:lower:]' '[:upper:]'
echo "⚓️ 📥 [$(date -u)] Pull 'tests' image..."
docker pull ${TESTS_IMAGE_NAME}
echo "⚓️ 🏎 [$(date -u)] Run tests..."
docker run -w /deckhouse -v ${{github.workspace}}:/deckhouse -e "TERM=xterm-256color" -v ~/go-pkg-cache:/go/pkg ${TESTS_IMAGE_NAME} dmt lint -l INFO /modules
- #
+ #
#
- name: Update comment on finish
id: update_comment_on_finish