Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test #397

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

test #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d3bac2
[testing] Fix e2e tests on alternative editions for PRs
Taior Nov 29, 2024
2621c67
removeme
Taior Nov 29, 2024
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
3 changes: 2 additions & 1 deletion .github/ci_templates/e2e_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ check_e2e_labels:
{!{ printf "run_%s_%s: ${{ steps.check.outputs.run_%s_%s }}" $cri $kubernetesVersionSlug $cri $kubernetesVersionSlug }!}
{!{- end -}!}
{!{- end }!}
edition: ${{ steps.check.outputs.edition }}
multimaster: ${{ steps.check.outputs.multimaster }}
steps:
{!{ tmpl.Exec "checkout_step" . | strings.Indent 4 }!}
Expand Down Expand Up @@ -346,7 +347,7 @@ check_e2e_labels:
{!{- end }!}
EVENT_LABEL: ${{ github.event.label.name }}
{!{- if coll.Has $ctx "manualRun" }!}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
{!{- end }!}
runs-on: [self-hosted, {!{ $runsOnLabel }!}]
steps:
Expand Down
7 changes: 6 additions & 1 deletion .github/scripts/js/ci.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,10 +478,11 @@ const setCRIAndVersionsFromLabels = ({ core, labels, kubernetesDefaultVersion })
let ver = [];
let cri = [];
let multimaster = e2eDefaults.multimaster;
let edition = "";

for (const label of labels) {
const info = knownLabels[label.name];
if (!info || info.type !== 'e2e-use') {
if (!info || (info.type !== 'e2e-use' && info.type !== 'edition')) {
continue;
}
if (info.cri) {
Expand All @@ -492,6 +493,10 @@ const setCRIAndVersionsFromLabels = ({ core, labels, kubernetesDefaultVersion })
core.info(`Detect '${label.name}': use Kubernetes version '${info.ver}'`);
ver.push(info.ver.replace(/\./g, '_'));
}
if (info.edition) {
core.info(`Detect '${label.name}': use edition '${info.edition}'`);
edition = info.edition;
}
if (info.multimaster) {
core.info(`Detect '${label.name}': use Kubernetes multimaster configuration`);
multimaster = true;
Expand Down
10 changes: 5 additions & 5 deletions .github/scripts/js/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ const labels = {
'e2e/use/multimaster': { type: 'e2e-use', multimaster: true },

// E2E: edition
'e2e/use/edition/ce': { type: 'e2e-edition', edition: 'CE' },
'e2e/use/edition/ee': { type: 'e2e-edition', edition: 'EE' },
'e2e/use/edition/be': { type: 'e2e-edition', edition: 'BE' },
'e2e/use/edition/se': { type: 'e2e-edition', edition: 'SE' },
'e2e/use/edition/fe': { type: 'e2e-edition', edition: 'FE' },
'e2e/use/edition/ce': { type: 'e2e-use', edition: 'CE' },
'e2e/use/edition/ee': { type: 'e2e-use', edition: 'EE' },
'e2e/use/edition/be': { type: 'e2e-use', edition: 'BE' },
'e2e/use/edition/se': { type: 'e2e-use', edition: 'SE' },
'e2e/use/edition/fe': { type: 'e2e-use', edition: 'FE' },

// Allow running workflows for external PRs.
'status/ok-to-test': { type: 'ok-to-test' },
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-abort-aws.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
edition: ${{ steps.check.outputs.edition }}
multimaster: ${{ steps.check.outputs.multimaster }}
steps:

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-abort-azure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
edition: ${{ steps.check.outputs.edition }}
multimaster: ${{ steps.check.outputs.multimaster }}
steps:

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-abort-eks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
edition: ${{ steps.check.outputs.edition }}
multimaster: ${{ steps.check.outputs.multimaster }}
steps:

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-abort-gcp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
edition: ${{ steps.check.outputs.edition }}
multimaster: ${{ steps.check.outputs.multimaster }}
steps:

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-abort-openstack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
edition: ${{ steps.check.outputs.edition }}
multimaster: ${{ steps.check.outputs.multimaster }}
steps:

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-abort-static.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
edition: ${{ steps.check.outputs.edition }}
multimaster: ${{ steps.check.outputs.multimaster }}
steps:

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-abort-vcd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
edition: ${{ steps.check.outputs.edition }}
multimaster: ${{ steps.check.outputs.multimaster }}
steps:

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-abort-vsphere.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
edition: ${{ steps.check.outputs.edition }}
multimaster: ${{ steps.check.outputs.multimaster }}
steps:

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-abort-yandex-cloud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
edition: ${{ steps.check.outputs.edition }}
multimaster: ${{ steps.check.outputs.multimaster }}
steps:

Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/e2e-aws.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ jobs:
run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
edition: ${{ steps.check.outputs.edition }}
multimaster: ${{ steps.check.outputs.multimaster }}
steps:

Expand Down Expand Up @@ -216,7 +217,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "1.26"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -708,7 +709,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "1.27"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -1200,7 +1201,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "1.28"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -1692,7 +1693,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "1.29"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -2184,7 +2185,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "1.30"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -2676,7 +2677,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "1.31"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -3168,7 +3169,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "Automatic"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/e2e-azure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ jobs:
run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
edition: ${{ steps.check.outputs.edition }}
multimaster: ${{ steps.check.outputs.multimaster }}
steps:

Expand Down Expand Up @@ -216,7 +217,7 @@ jobs:
LAYOUT: Standard
KUBERNETES_VERSION: "1.26"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -716,7 +717,7 @@ jobs:
LAYOUT: Standard
KUBERNETES_VERSION: "1.27"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -1216,7 +1217,7 @@ jobs:
LAYOUT: Standard
KUBERNETES_VERSION: "1.28"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -1716,7 +1717,7 @@ jobs:
LAYOUT: Standard
KUBERNETES_VERSION: "1.29"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -2216,7 +2217,7 @@ jobs:
LAYOUT: Standard
KUBERNETES_VERSION: "1.30"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -2716,7 +2717,7 @@ jobs:
LAYOUT: Standard
KUBERNETES_VERSION: "1.31"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -3216,7 +3217,7 @@ jobs:
LAYOUT: Standard
KUBERNETES_VERSION: "Automatic"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/e2e-eks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ jobs:
run_containerd_1_30: ${{ steps.check.outputs.run_containerd_1_30 }}
run_containerd_1_31: ${{ steps.check.outputs.run_containerd_1_31 }}
run_containerd_automatic: ${{ steps.check.outputs.run_containerd_automatic }}
edition: ${{ steps.check.outputs.edition }}
multimaster: ${{ steps.check.outputs.multimaster }}
steps:

Expand Down Expand Up @@ -216,7 +217,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "1.26"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -753,7 +754,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "1.27"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -1290,7 +1291,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "1.28"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -1827,7 +1828,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "1.29"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -2364,7 +2365,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "1.30"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -2901,7 +2902,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "1.31"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down Expand Up @@ -3438,7 +3439,7 @@ jobs:
LAYOUT: WithoutNAT
KUBERNETES_VERSION: "1.27"
EVENT_LABEL: ${{ github.event.label.name }}
WERF_ENV: "${{ fromJson(inputs.test_config).edition || 'FE'}}"
WERF_ENV: "${{ needs.check_e2e_labels.outputs.edition || fromJson(inputs.test_config).edition }}"
runs-on: [self-hosted, e2e-common]
steps:

Expand Down
Loading
Loading