From 02bcf752702de94c3db2232a7f67dfe0236fd8c3 Mon Sep 17 00:00:00 2001 From: Vladimir Portnov Date: Thu, 19 Sep 2024 15:05:34 +0800 Subject: [PATCH] [ci] fix e2e edition choice Signed-off-by: Vladimir Portnov --- .github/ci_templates/e2e_tests.yml | 2 +- .github/workflows/e2e-abort-aws.yml | 6 ------ .github/workflows/e2e-abort-azure.yml | 6 ------ .github/workflows/e2e-abort-eks.yml | 6 ------ .github/workflows/e2e-abort-gcp.yml | 6 ------ .github/workflows/e2e-abort-openstack.yml | 6 ------ .github/workflows/e2e-abort-static.yml | 6 ------ .github/workflows/e2e-abort-vcd.yml | 6 ------ .github/workflows/e2e-abort-vsphere.yml | 6 ------ .github/workflows/e2e-abort-yandex-cloud.yml | 6 ------ .github/workflows/e2e-aws.yml | 6 ++++++ .github/workflows/e2e-azure.yml | 6 ++++++ .github/workflows/e2e-daily.yml | 8 ++++++++ .github/workflows/e2e-eks.yml | 6 ++++++ .github/workflows/e2e-gcp.yml | 6 ++++++ .github/workflows/e2e-openstack.yml | 6 ++++++ .github/workflows/e2e-static.yml | 6 ++++++ .github/workflows/e2e-vcd.yml | 6 ++++++ .github/workflows/e2e-vsphere.yml | 6 ++++++ .github/workflows/e2e-yandex-cloud.yml | 6 ++++++ 20 files changed, 63 insertions(+), 55 deletions(-) diff --git a/.github/ci_templates/e2e_tests.yml b/.github/ci_templates/e2e_tests.yml index af4850e2a9..e116b35bc9 100644 --- a/.github/ci_templates/e2e_tests.yml +++ b/.github/ci_templates/e2e_tests.yml @@ -339,6 +339,7 @@ check_e2e_labels: KUBERNETES_VERSION: "{!{ $ctx.kubernetesVersion }!}" {!{- end }!} EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, {!{ $runsOnLabel }!}] steps: {!{ tmpl.Exec "started_at_output" . | strings.Indent 4 }!} @@ -636,7 +637,6 @@ check_e2e_labels: KUBERNETES_VERSION: "{!{ $ctx.kubernetesVersion }!}" {!{- end }!} EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, {!{ $runsOnLabel }!}] steps: {!{ tmpl.Exec "started_at_output" . | strings.Indent 4 }!} diff --git a/.github/workflows/e2e-abort-aws.yml b/.github/workflows/e2e-abort-aws.yml index 8c78173c6e..14b86480ab 100644 --- a/.github/workflows/e2e-abort-aws.yml +++ b/.github/workflows/e2e-abort-aws.yml @@ -82,7 +82,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -361,7 +360,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -640,7 +638,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -919,7 +916,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1198,7 +1194,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1477,7 +1472,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-abort-azure.yml b/.github/workflows/e2e-abort-azure.yml index f88b31e246..bc278f4e0e 100644 --- a/.github/workflows/e2e-abort-azure.yml +++ b/.github/workflows/e2e-abort-azure.yml @@ -82,7 +82,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -365,7 +364,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -648,7 +646,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -931,7 +928,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1214,7 +1210,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1497,7 +1492,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-abort-eks.yml b/.github/workflows/e2e-abort-eks.yml index 08450e3947..f884f80eb1 100644 --- a/.github/workflows/e2e-abort-eks.yml +++ b/.github/workflows/e2e-abort-eks.yml @@ -82,7 +82,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -364,7 +363,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -646,7 +644,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -928,7 +925,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1210,7 +1206,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1492,7 +1487,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-abort-gcp.yml b/.github/workflows/e2e-abort-gcp.yml index 8a239b278b..d30c290f06 100644 --- a/.github/workflows/e2e-abort-gcp.yml +++ b/.github/workflows/e2e-abort-gcp.yml @@ -82,7 +82,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -359,7 +358,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -636,7 +634,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -913,7 +910,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1190,7 +1186,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1467,7 +1462,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-abort-openstack.yml b/.github/workflows/e2e-abort-openstack.yml index 96cfb8a916..1c32c70912 100644 --- a/.github/workflows/e2e-abort-openstack.yml +++ b/.github/workflows/e2e-abort-openstack.yml @@ -82,7 +82,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -359,7 +358,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -636,7 +634,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -913,7 +910,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1190,7 +1186,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1467,7 +1462,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-abort-static.yml b/.github/workflows/e2e-abort-static.yml index 6ec5e87da8..d4c6c6d823 100644 --- a/.github/workflows/e2e-abort-static.yml +++ b/.github/workflows/e2e-abort-static.yml @@ -82,7 +82,6 @@ jobs: LAYOUT: Static KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -359,7 +358,6 @@ jobs: LAYOUT: Static KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -636,7 +634,6 @@ jobs: LAYOUT: Static KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -913,7 +910,6 @@ jobs: LAYOUT: Static KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1190,7 +1186,6 @@ jobs: LAYOUT: Static KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1467,7 +1462,6 @@ jobs: LAYOUT: Static KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-abort-vcd.yml b/.github/workflows/e2e-abort-vcd.yml index 0be9d2a583..99c407b67f 100644 --- a/.github/workflows/e2e-abort-vcd.yml +++ b/.github/workflows/e2e-abort-vcd.yml @@ -82,7 +82,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -367,7 +366,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -652,7 +650,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -937,7 +934,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1222,7 +1218,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1507,7 +1502,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-abort-vsphere.yml b/.github/workflows/e2e-abort-vsphere.yml index ded132f91e..269bbfd354 100644 --- a/.github/workflows/e2e-abort-vsphere.yml +++ b/.github/workflows/e2e-abort-vsphere.yml @@ -82,7 +82,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-vsphere] steps: @@ -361,7 +360,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-vsphere] steps: @@ -640,7 +638,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-vsphere] steps: @@ -919,7 +916,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-vsphere] steps: @@ -1198,7 +1194,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-vsphere] steps: @@ -1477,7 +1472,6 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-vsphere] steps: diff --git a/.github/workflows/e2e-abort-yandex-cloud.yml b/.github/workflows/e2e-abort-yandex-cloud.yml index 5d2b35020a..08577ef52b 100644 --- a/.github/workflows/e2e-abort-yandex-cloud.yml +++ b/.github/workflows/e2e-abort-yandex-cloud.yml @@ -82,7 +82,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -363,7 +362,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -644,7 +642,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -925,7 +922,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1206,7 +1202,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1487,7 +1482,6 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} - WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-aws.yml b/.github/workflows/e2e-aws.yml index 07143e6ba5..7f513eac80 100644 --- a/.github/workflows/e2e-aws.yml +++ b/.github/workflows/e2e-aws.yml @@ -214,6 +214,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -690,6 +691,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1166,6 +1168,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1642,6 +1645,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2118,6 +2122,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2594,6 +2599,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-azure.yml b/.github/workflows/e2e-azure.yml index 0ec324ed99..e47951ce36 100644 --- a/.github/workflows/e2e-azure.yml +++ b/.github/workflows/e2e-azure.yml @@ -214,6 +214,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -698,6 +699,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1182,6 +1184,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1666,6 +1669,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2150,6 +2154,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2634,6 +2639,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-daily.yml b/.github/workflows/e2e-daily.yml index f831efa1e4..3bb811bbfc 100644 --- a/.github/workflows/e2e-daily.yml +++ b/.github/workflows/e2e-daily.yml @@ -151,6 +151,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -598,6 +599,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1053,6 +1055,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1496,6 +1499,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1947,6 +1951,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2390,6 +2395,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-vsphere] steps: @@ -2837,6 +2843,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -3296,6 +3303,7 @@ jobs: LAYOUT: Static KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-eks.yml b/.github/workflows/e2e-eks.yml index 0575b790d8..d53cdd1222 100644 --- a/.github/workflows/e2e-eks.yml +++ b/.github/workflows/e2e-eks.yml @@ -214,6 +214,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -733,6 +734,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1252,6 +1254,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1771,6 +1774,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2290,6 +2294,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2809,6 +2814,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-gcp.yml b/.github/workflows/e2e-gcp.yml index 24e4b00575..3e5bc85a9f 100644 --- a/.github/workflows/e2e-gcp.yml +++ b/.github/workflows/e2e-gcp.yml @@ -214,6 +214,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -686,6 +687,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1158,6 +1160,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1630,6 +1633,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2102,6 +2106,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2574,6 +2579,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-openstack.yml b/.github/workflows/e2e-openstack.yml index ecacbd36d9..5d528e1ec7 100644 --- a/.github/workflows/e2e-openstack.yml +++ b/.github/workflows/e2e-openstack.yml @@ -214,6 +214,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -686,6 +687,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1158,6 +1160,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1630,6 +1633,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2102,6 +2106,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2574,6 +2579,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-static.yml b/.github/workflows/e2e-static.yml index dcee9cf5f7..cf21aa57a5 100644 --- a/.github/workflows/e2e-static.yml +++ b/.github/workflows/e2e-static.yml @@ -214,6 +214,7 @@ jobs: LAYOUT: Static KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -686,6 +687,7 @@ jobs: LAYOUT: Static KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1158,6 +1160,7 @@ jobs: LAYOUT: Static KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1630,6 +1633,7 @@ jobs: LAYOUT: Static KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2102,6 +2106,7 @@ jobs: LAYOUT: Static KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2574,6 +2579,7 @@ jobs: LAYOUT: Static KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-vcd.yml b/.github/workflows/e2e-vcd.yml index 2361404677..68dda1d8ad 100644 --- a/.github/workflows/e2e-vcd.yml +++ b/.github/workflows/e2e-vcd.yml @@ -214,6 +214,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -702,6 +703,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1190,6 +1192,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1678,6 +1681,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2166,6 +2170,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2654,6 +2659,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: diff --git a/.github/workflows/e2e-vsphere.yml b/.github/workflows/e2e-vsphere.yml index 256b0bcd85..84cafe4f72 100644 --- a/.github/workflows/e2e-vsphere.yml +++ b/.github/workflows/e2e-vsphere.yml @@ -214,6 +214,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-vsphere] steps: @@ -690,6 +691,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-vsphere] steps: @@ -1166,6 +1168,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-vsphere] steps: @@ -1642,6 +1645,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-vsphere] steps: @@ -2118,6 +2122,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-vsphere] steps: @@ -2594,6 +2599,7 @@ jobs: LAYOUT: Standard KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-vsphere] steps: diff --git a/.github/workflows/e2e-yandex-cloud.yml b/.github/workflows/e2e-yandex-cloud.yml index ebea4c3c1a..10c0137ff8 100644 --- a/.github/workflows/e2e-yandex-cloud.yml +++ b/.github/workflows/e2e-yandex-cloud.yml @@ -214,6 +214,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.26" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -694,6 +695,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.27" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1174,6 +1176,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.28" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -1654,6 +1657,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.29" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2134,6 +2138,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "1.30" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: @@ -2614,6 +2619,7 @@ jobs: LAYOUT: WithoutNAT KUBERNETES_VERSION: "Automatic" EVENT_LABEL: ${{ github.event.label.name }} + WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}" runs-on: [self-hosted, e2e-common] steps: