Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/ci_templates/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ steps:

- name: Build and push deckhouse images
id: build
timeout-minutes: 30
env:
WERF_PARALLEL_TASKS_LIMIT: 3
WERF_PARALLEL_TASKS_LIMIT: 5
WERF_PARALLEL: "true"
WERF_EXPERIMENTAL_IMPORT_BY_SOURCE_IMAGE_TAG: 1
{!{- if eq $buildType "dev" }!}
WERF_DISABLE_PUBLISH_TAG_CACHE_SYNC: 1
Expand Down Expand Up @@ -192,7 +194,7 @@ steps:

# The Git tag may contain a '+' sign, so use slugify for this situation.
# Slugify doesn't change a tag with safe-only characters.
IMAGE_TAG=$(d8-build dk slugify --format docker-tag "${CI_COMMIT_TAG}")
IMAGE_TAG=$(werf-test slugify --format docker-tag "${CI_COMMIT_TAG}")
export WERF_DISABLE_META_TAGS=true
{!{- else if eq $buildType "pre-release" }!}
# The Git tag may contain a '+' sign, so use slugify for this situation.
Expand All @@ -212,9 +214,8 @@ steps:
IMAGE_TAG=${CI_COMMIT_REF_SLUG}${IMAGE_EDITION:+-${IMAGE_EDITION}}${REPO_SUFFIX:+-${REPO_SUFFIX}}
{!{- end }!}

type d8-build && source $(d8-build dk ci-env github --verbose --as-file)
d8-build dk build \
--parallel=true --parallel-tasks-limit=10 \
type werf-test && source $(werf-test ci-env github --verbose --as-file)
werf-test build --log-debug \
--save-build-report=true \
--build-report-path images_tags_werf.json

Expand Down
2 changes: 1 addition & 1 deletion .github/ci_templates/e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{!{ end -}!}

{!{- define "e2e_kubernetes_default_version" -}!}
1.33
1.34
{!{- end -}!}

# job for set e2e requirement status
Expand Down
3 changes: 1 addition & 2 deletions .github/scripts/js/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ const labels = {
'e2e/run/zvirt': { type: 'e2e-run', provider: 'zvirt' },

// E2E: use Kubernetes version
'e2e/use/k8s/1.31': { type: 'e2e-use', ver: '1.31' },
'e2e/use/k8s/1.32': { type: 'e2e-use', ver: '1.32' },
'e2e/use/k8s/workflow_templates/e2e.multi.yml2': { type: 'e2e-use', ver: '1.32' },
'e2e/use/k8s/1.33': { type: 'e2e-use', ver: '1.33' },
'e2e/use/k8s/1.34': { type: 'e2e-use', ver: '1.34' },
'e2e/use/k8s/1.35': { type: 'e2e-use', ver: '1.35' },
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/validation_bashible.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ clusterBootstrap:
clusterDNSAddress: 10.222.0.10
clusterDomain: cluster.local
nodeIP: 192.168.199.23
kubernetesVersion: "1.31"
kubernetesVersion: "1.32"
cri: "Containerd"
nodeGroup:
cloudInstances:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflow_templates/e2e.abort.multi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ $CI_COMMIT_REF_SLUG is a tag of published deckhouse images. It has a form

{!{- $providerNames := slice "AWS" "Azure" "GCP" "Yandex.Cloud" "OpenStack" "vSphere" "VCD" "Static" "EKS" "DVP" "zVirt" -}!}
{!{- $criNames := slice "Containerd" "ContainerdV2" -}!}
{!{- $kubernetesVersions := slice "1.31" "1.32" "1.33" "1.34" "1.35" "1.36" "Automatic" -}!}
{!{- $kubernetesVersions := slice "1.32" "1.33" "1.34" "1.35" "1.36" "Automatic" -}!}

{!{- range $providerName := $providerNames -}!}
{!{- $provider := $providerName | replaceAll "." "-" | toLower -}!}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflow_templates/e2e.multi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ $CI_COMMIT_REF_SLUG is a tag of published deckhouse images. It has a form

{!{- $providerNames := slice "AWS" "Azure" "GCP" "Yandex.Cloud" "OpenStack" "vSphere" "VCD" "Static" "EKS" "DVP" "zVirt" -}!}
{!{- $criNames := slice "Containerd" "ContainerdV2" -}!}
{!{- $kubernetesVersions := slice "1.31" "1.32" "1.33" "1.34" "1.35" "1.36" "Automatic" -}!}
{!{- $kubernetesVersions := slice "1.32" "1.33" "1.34" "1.35" "1.36" "Automatic" -}!}

{!{- range $providerName := $providerNames -}!}
{!{- $provider := $providerName | replaceAll "." "-" | toLower -}!}
Expand Down
63 changes: 35 additions & 28 deletions .github/workflows/build-and-test_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -531,8 +531,10 @@ jobs:

- name: Build and push deckhouse images
id: build
timeout-minutes: 30
env:
WERF_PARALLEL_TASKS_LIMIT: 3
WERF_PARALLEL_TASKS_LIMIT: 5
WERF_PARALLEL: "true"
WERF_EXPERIMENTAL_IMPORT_BY_SOURCE_IMAGE_TAG: 1
WERF_DISABLE_PUBLISH_TAG_CACHE_SYNC: 1
DECKHOUSE_DEV_REGISTRY_USER : ${{ steps.secrets.outputs.DECKHOUSE_DEV_REGISTRY_USER }}
Expand Down Expand Up @@ -606,9 +608,8 @@ jobs:
# Use it as image tag. Add suffix to not overlap with PRs in main repo.
IMAGE_TAG=${CI_COMMIT_REF_SLUG}${IMAGE_EDITION:+-${IMAGE_EDITION}}${REPO_SUFFIX:+-${REPO_SUFFIX}}

type d8-build && source $(d8-build dk ci-env github --verbose --as-file)
d8-build dk build \
--parallel=true --parallel-tasks-limit=10 \
type werf-test && source $(werf-test ci-env github --verbose --as-file)
werf-test build --log-debug \
--save-build-report=true \
--build-report-path images_tags_werf.json

Expand Down Expand Up @@ -830,8 +831,10 @@ jobs:

- name: Build and push deckhouse images
id: build
timeout-minutes: 30
env:
WERF_PARALLEL_TASKS_LIMIT: 3
WERF_PARALLEL_TASKS_LIMIT: 5
WERF_PARALLEL: "true"
WERF_EXPERIMENTAL_IMPORT_BY_SOURCE_IMAGE_TAG: 1
WERF_DISABLE_PUBLISH_TAG_CACHE_SYNC: 1
DECKHOUSE_DEV_REGISTRY_USER : ${{ steps.secrets.outputs.DECKHOUSE_DEV_REGISTRY_USER }}
Expand Down Expand Up @@ -905,9 +908,8 @@ jobs:
# Use it as image tag. Add suffix to not overlap with PRs in main repo.
IMAGE_TAG=${CI_COMMIT_REF_SLUG}${IMAGE_EDITION:+-${IMAGE_EDITION}}${REPO_SUFFIX:+-${REPO_SUFFIX}}

type d8-build && source $(d8-build dk ci-env github --verbose --as-file)
d8-build dk build \
--parallel=true --parallel-tasks-limit=10 \
type werf-test && source $(werf-test ci-env github --verbose --as-file)
werf-test build --log-debug \
--save-build-report=true \
--build-report-path images_tags_werf.json

Expand Down Expand Up @@ -1128,8 +1130,10 @@ jobs:

- name: Build and push deckhouse images
id: build
timeout-minutes: 30
env:
WERF_PARALLEL_TASKS_LIMIT: 3
WERF_PARALLEL_TASKS_LIMIT: 5
WERF_PARALLEL: "true"
WERF_EXPERIMENTAL_IMPORT_BY_SOURCE_IMAGE_TAG: 1
WERF_DISABLE_PUBLISH_TAG_CACHE_SYNC: 1
DECKHOUSE_DEV_REGISTRY_USER : ${{ steps.secrets.outputs.DECKHOUSE_DEV_REGISTRY_USER }}
Expand Down Expand Up @@ -1203,9 +1207,8 @@ jobs:
# Use it as image tag. Add suffix to not overlap with PRs in main repo.
IMAGE_TAG=${CI_COMMIT_REF_SLUG}${IMAGE_EDITION:+-${IMAGE_EDITION}}${REPO_SUFFIX:+-${REPO_SUFFIX}}

type d8-build && source $(d8-build dk ci-env github --verbose --as-file)
d8-build dk build \
--parallel=true --parallel-tasks-limit=10 \
type werf-test && source $(werf-test ci-env github --verbose --as-file)
werf-test build --log-debug \
--save-build-report=true \
--build-report-path images_tags_werf.json

Expand Down Expand Up @@ -1426,8 +1429,10 @@ jobs:

- name: Build and push deckhouse images
id: build
timeout-minutes: 30
env:
WERF_PARALLEL_TASKS_LIMIT: 3
WERF_PARALLEL_TASKS_LIMIT: 5
WERF_PARALLEL: "true"
WERF_EXPERIMENTAL_IMPORT_BY_SOURCE_IMAGE_TAG: 1
WERF_DISABLE_PUBLISH_TAG_CACHE_SYNC: 1
DECKHOUSE_DEV_REGISTRY_USER : ${{ steps.secrets.outputs.DECKHOUSE_DEV_REGISTRY_USER }}
Expand Down Expand Up @@ -1501,9 +1506,8 @@ jobs:
# Use it as image tag. Add suffix to not overlap with PRs in main repo.
IMAGE_TAG=${CI_COMMIT_REF_SLUG}${IMAGE_EDITION:+-${IMAGE_EDITION}}${REPO_SUFFIX:+-${REPO_SUFFIX}}

type d8-build && source $(d8-build dk ci-env github --verbose --as-file)
d8-build dk build \
--parallel=true --parallel-tasks-limit=10 \
type werf-test && source $(werf-test ci-env github --verbose --as-file)
werf-test build --log-debug \
--save-build-report=true \
--build-report-path images_tags_werf.json

Expand Down Expand Up @@ -1724,8 +1728,10 @@ jobs:

- name: Build and push deckhouse images
id: build
timeout-minutes: 30
env:
WERF_PARALLEL_TASKS_LIMIT: 3
WERF_PARALLEL_TASKS_LIMIT: 5
WERF_PARALLEL: "true"
WERF_EXPERIMENTAL_IMPORT_BY_SOURCE_IMAGE_TAG: 1
WERF_DISABLE_PUBLISH_TAG_CACHE_SYNC: 1
DECKHOUSE_DEV_REGISTRY_USER : ${{ steps.secrets.outputs.DECKHOUSE_DEV_REGISTRY_USER }}
Expand Down Expand Up @@ -1799,9 +1805,8 @@ jobs:
# Use it as image tag. Add suffix to not overlap with PRs in main repo.
IMAGE_TAG=${CI_COMMIT_REF_SLUG}${IMAGE_EDITION:+-${IMAGE_EDITION}}${REPO_SUFFIX:+-${REPO_SUFFIX}}

type d8-build && source $(d8-build dk ci-env github --verbose --as-file)
d8-build dk build \
--parallel=true --parallel-tasks-limit=10 \
type werf-test && source $(werf-test ci-env github --verbose --as-file)
werf-test build --log-debug \
--save-build-report=true \
--build-report-path images_tags_werf.json

Expand Down Expand Up @@ -2022,8 +2027,10 @@ jobs:

- name: Build and push deckhouse images
id: build
timeout-minutes: 30
env:
WERF_PARALLEL_TASKS_LIMIT: 3
WERF_PARALLEL_TASKS_LIMIT: 5
WERF_PARALLEL: "true"
WERF_EXPERIMENTAL_IMPORT_BY_SOURCE_IMAGE_TAG: 1
WERF_DISABLE_PUBLISH_TAG_CACHE_SYNC: 1
DECKHOUSE_DEV_REGISTRY_USER : ${{ steps.secrets.outputs.DECKHOUSE_DEV_REGISTRY_USER }}
Expand Down Expand Up @@ -2097,9 +2104,8 @@ jobs:
# Use it as image tag. Add suffix to not overlap with PRs in main repo.
IMAGE_TAG=${CI_COMMIT_REF_SLUG}${IMAGE_EDITION:+-${IMAGE_EDITION}}${REPO_SUFFIX:+-${REPO_SUFFIX}}

type d8-build && source $(d8-build dk ci-env github --verbose --as-file)
d8-build dk build \
--parallel=true --parallel-tasks-limit=10 \
type werf-test && source $(werf-test ci-env github --verbose --as-file)
werf-test build --log-debug \
--save-build-report=true \
--build-report-path images_tags_werf.json

Expand Down Expand Up @@ -2320,8 +2326,10 @@ jobs:

- name: Build and push deckhouse images
id: build
timeout-minutes: 30
env:
WERF_PARALLEL_TASKS_LIMIT: 3
WERF_PARALLEL_TASKS_LIMIT: 5
WERF_PARALLEL: "true"
WERF_EXPERIMENTAL_IMPORT_BY_SOURCE_IMAGE_TAG: 1
WERF_DISABLE_PUBLISH_TAG_CACHE_SYNC: 1
DECKHOUSE_DEV_REGISTRY_USER : ${{ steps.secrets.outputs.DECKHOUSE_DEV_REGISTRY_USER }}
Expand Down Expand Up @@ -2395,9 +2403,8 @@ jobs:
# Use it as image tag. Add suffix to not overlap with PRs in main repo.
IMAGE_TAG=${CI_COMMIT_REF_SLUG}${IMAGE_EDITION:+-${IMAGE_EDITION}}${REPO_SUFFIX:+-${REPO_SUFFIX}}

type d8-build && source $(d8-build dk ci-env github --verbose --as-file)
d8-build dk build \
--parallel=true --parallel-tasks-limit=10 \
type werf-test && source $(werf-test ci-env github --verbose --as-file)
werf-test build --log-debug \
--save-build-report=true \
--build-report-path images_tags_werf.json

Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/build-and-test_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,10 @@ jobs:

- name: Build and push deckhouse images
id: build
timeout-minutes: 30
env:
WERF_PARALLEL_TASKS_LIMIT: 3
WERF_PARALLEL_TASKS_LIMIT: 5
WERF_PARALLEL: "true"
WERF_EXPERIMENTAL_IMPORT_BY_SOURCE_IMAGE_TAG: 1
DECKHOUSE_DEV_REGISTRY_USER : ${{ steps.secrets.outputs.DECKHOUSE_DEV_REGISTRY_USER }}
DECKHOUSE_DEV_REGISTRY_PASSWORD: ${{ steps.secrets.outputs.DECKHOUSE_DEV_REGISTRY_PASSWORD }}
Expand Down Expand Up @@ -381,9 +383,8 @@ jobs:
# Use it as image tag. Add suffix to not overlap with PRs in main repo.
IMAGE_TAG=${CI_COMMIT_REF_SLUG}${IMAGE_EDITION:+-${IMAGE_EDITION}}${REPO_SUFFIX:+-${REPO_SUFFIX}}

type d8-build && source $(d8-build dk ci-env github --verbose --as-file)
d8-build dk build \
--parallel=true --parallel-tasks-limit=10 \
type werf-test && source $(werf-test ci-env github --verbose --as-file)
werf-test build --log-debug \
--save-build-report=true \
--build-report-path images_tags_werf.json

Expand Down
Loading
Loading