Skip to content

Commit

Permalink
[ci] fix e2e edition choice
Browse files Browse the repository at this point in the history 
Signed-off-by: Vladimir Portnov <[email protected]>
  • Loading branch information
@Taior
Taior committed Sep 19, 2024
1 parent 54eccdc commit 02bcf75
Show file tree
Hide file tree
Showing 20 changed files with 63 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .github/ci_templates/e2e_tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }!}
Expand Down Expand Up @@ -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 }!}
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/e2e-abort-aws.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/e2e-abort-azure.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/e2e-abort-eks.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/e2e-abort-gcp.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/e2e-abort-openstack.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/e2e-abort-static.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/e2e-abort-vcd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/e2e-abort-vsphere.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down
Loading

0 comments on commit 02bcf75

Please sign in to comment.