From 1d3bac2b79cdf1997512ccd77b8f5da184ffdb73 Mon Sep 17 00:00:00 2001 From: Vladimir Portnov Date: Fri, 29 Nov 2024 13:23:48 +0800 Subject: [PATCH 1/2] [testing] Fix e2e tests on alternative editions for PRs Signed-off-by: Vladimir Portnov --- .github/ci_templates/e2e_tests.yml | 3 ++- .github/scripts/js/ci.js | 7 ++++++- .github/scripts/js/constants.js | 10 +++++----- .github/workflows/e2e-abort-aws.yml | 1 + .github/workflows/e2e-abort-azure.yml | 1 + .github/workflows/e2e-abort-eks.yml | 1 + .github/workflows/e2e-abort-gcp.yml | 1 + .github/workflows/e2e-abort-openstack.yml | 1 + .github/workflows/e2e-abort-static.yml | 1 + .github/workflows/e2e-abort-vcd.yml | 1 + .github/workflows/e2e-abort-vsphere.yml | 1 + .github/workflows/e2e-abort-yandex-cloud.yml | 1 + .github/workflows/e2e-aws.yml | 15 ++++++++------- .github/workflows/e2e-azure.yml | 15 ++++++++------- .github/workflows/e2e-eks.yml | 15 ++++++++------- .github/workflows/e2e-gcp.yml | 15 ++++++++------- .github/workflows/e2e-openstack.yml | 15 ++++++++------- .github/workflows/e2e-static.yml | 15 ++++++++------- .github/workflows/e2e-vcd.yml | 15 ++++++++------- .github/workflows/e2e-vsphere.yml | 15 ++++++++------- .github/workflows/e2e-yandex-cloud.yml | 15 ++++++++------- 21 files changed, 94 insertions(+), 70 deletions(-) diff --git a/.github/ci_templates/e2e_tests.yml b/.github/ci_templates/e2e_tests.yml index 50a78a2253..3aa3f94c71 100644 --- a/.github/ci_templates/e2e_tests.yml +++ b/.github/ci_templates/e2e_tests.yml @@ -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 }!} @@ -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: diff --git a/.github/scripts/js/ci.js b/.github/scripts/js/ci.js index 614d802f69..db43d34257 100644 --- a/.github/scripts/js/ci.js +++ b/.github/scripts/js/ci.js @@ -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) { @@ -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; diff --git a/.github/scripts/js/constants.js b/.github/scripts/js/constants.js index a3ebeff5ad..eb71326f21 100644 --- a/.github/scripts/js/constants.js +++ b/.github/scripts/js/constants.js @@ -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' }, diff --git a/.github/workflows/e2e-abort-aws.yml b/.github/workflows/e2e-abort-aws.yml index 86d4314430..37e99d3b7b 100644 --- a/.github/workflows/e2e-abort-aws.yml +++ b/.github/workflows/e2e-abort-aws.yml @@ -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: diff --git a/.github/workflows/e2e-abort-azure.yml b/.github/workflows/e2e-abort-azure.yml index 5ebfaeef42..349b8ab055 100644 --- a/.github/workflows/e2e-abort-azure.yml +++ b/.github/workflows/e2e-abort-azure.yml @@ -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: diff --git a/.github/workflows/e2e-abort-eks.yml b/.github/workflows/e2e-abort-eks.yml index 997d22f847..272843e2ce 100644 --- a/.github/workflows/e2e-abort-eks.yml +++ b/.github/workflows/e2e-abort-eks.yml @@ -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: diff --git a/.github/workflows/e2e-abort-gcp.yml b/.github/workflows/e2e-abort-gcp.yml index 5a02dc0158..1fbf032f85 100644 --- a/.github/workflows/e2e-abort-gcp.yml +++ b/.github/workflows/e2e-abort-gcp.yml @@ -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: diff --git a/.github/workflows/e2e-abort-openstack.yml b/.github/workflows/e2e-abort-openstack.yml index 2ba02195f5..509f44dd53 100644 --- a/.github/workflows/e2e-abort-openstack.yml +++ b/.github/workflows/e2e-abort-openstack.yml @@ -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: diff --git a/.github/workflows/e2e-abort-static.yml b/.github/workflows/e2e-abort-static.yml index 7bdb3b820e..4533c47fe0 100644 --- a/.github/workflows/e2e-abort-static.yml +++ b/.github/workflows/e2e-abort-static.yml @@ -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: diff --git a/.github/workflows/e2e-abort-vcd.yml b/.github/workflows/e2e-abort-vcd.yml index 6cea2cdfa9..ffecd63d42 100644 --- a/.github/workflows/e2e-abort-vcd.yml +++ b/.github/workflows/e2e-abort-vcd.yml @@ -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: diff --git a/.github/workflows/e2e-abort-vsphere.yml b/.github/workflows/e2e-abort-vsphere.yml index 4e63ad58da..6e1fd85fbf 100644 --- a/.github/workflows/e2e-abort-vsphere.yml +++ b/.github/workflows/e2e-abort-vsphere.yml @@ -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: diff --git a/.github/workflows/e2e-abort-yandex-cloud.yml b/.github/workflows/e2e-abort-yandex-cloud.yml index a700b4df73..8f9bd3b2e9 100644 --- a/.github/workflows/e2e-abort-yandex-cloud.yml +++ b/.github/workflows/e2e-abort-yandex-cloud.yml @@ -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: diff --git a/.github/workflows/e2e-aws.yml b/.github/workflows/e2e-aws.yml index 7d40af8d01..f023a1fe68 100644 --- a/.github/workflows/e2e-aws.yml +++ b/.github/workflows/e2e-aws.yml @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/.github/workflows/e2e-azure.yml b/.github/workflows/e2e-azure.yml index 1974ef73df..35a42e0162 100644 --- a/.github/workflows/e2e-azure.yml +++ b/.github/workflows/e2e-azure.yml @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/.github/workflows/e2e-eks.yml b/.github/workflows/e2e-eks.yml index 93209bd072..5d1da593f6 100644 --- a/.github/workflows/e2e-eks.yml +++ b/.github/workflows/e2e-eks.yml @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/.github/workflows/e2e-gcp.yml b/.github/workflows/e2e-gcp.yml index 7746b6f596..7013756b08 100644 --- a/.github/workflows/e2e-gcp.yml +++ b/.github/workflows/e2e-gcp.yml @@ -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: @@ -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: @@ -704,7 +705,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: @@ -1192,7 +1193,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: @@ -1680,7 +1681,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: @@ -2168,7 +2169,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: @@ -2656,7 +2657,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: @@ -3144,7 +3145,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: diff --git a/.github/workflows/e2e-openstack.yml b/.github/workflows/e2e-openstack.yml index bb65046e16..dea99162fa 100644 --- a/.github/workflows/e2e-openstack.yml +++ b/.github/workflows/e2e-openstack.yml @@ -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: @@ -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: @@ -704,7 +705,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: @@ -1192,7 +1193,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: @@ -1680,7 +1681,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: @@ -2168,7 +2169,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: @@ -2656,7 +2657,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: @@ -3144,7 +3145,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: diff --git a/.github/workflows/e2e-static.yml b/.github/workflows/e2e-static.yml index 692a3c45b9..8c8b29401b 100644 --- a/.github/workflows/e2e-static.yml +++ b/.github/workflows/e2e-static.yml @@ -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: @@ -216,7 +217,7 @@ jobs: LAYOUT: Static 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: @@ -704,7 +705,7 @@ jobs: LAYOUT: Static 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: @@ -1192,7 +1193,7 @@ jobs: LAYOUT: Static 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: @@ -1680,7 +1681,7 @@ jobs: LAYOUT: Static 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: @@ -2168,7 +2169,7 @@ jobs: LAYOUT: Static 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: @@ -2656,7 +2657,7 @@ jobs: LAYOUT: Static 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: @@ -3144,7 +3145,7 @@ jobs: LAYOUT: Static 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: diff --git a/.github/workflows/e2e-vcd.yml b/.github/workflows/e2e-vcd.yml index b546eaa387..33a8f068b0 100644 --- a/.github/workflows/e2e-vcd.yml +++ b/.github/workflows/e2e-vcd.yml @@ -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: @@ -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: @@ -720,7 +721,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: @@ -1224,7 +1225,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: @@ -1728,7 +1729,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: @@ -2232,7 +2233,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: @@ -2736,7 +2737,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: @@ -3240,7 +3241,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: diff --git a/.github/workflows/e2e-vsphere.yml b/.github/workflows/e2e-vsphere.yml index 6111074606..d585e61865 100644 --- a/.github/workflows/e2e-vsphere.yml +++ b/.github/workflows/e2e-vsphere.yml @@ -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: @@ -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-vsphere] steps: @@ -708,7 +709,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-vsphere] steps: @@ -1200,7 +1201,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-vsphere] steps: @@ -1692,7 +1693,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-vsphere] steps: @@ -2184,7 +2185,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-vsphere] steps: @@ -2676,7 +2677,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-vsphere] steps: @@ -3168,7 +3169,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-vsphere] steps: diff --git a/.github/workflows/e2e-yandex-cloud.yml b/.github/workflows/e2e-yandex-cloud.yml index 7ea1bf0934..6624176651 100644 --- a/.github/workflows/e2e-yandex-cloud.yml +++ b/.github/workflows/e2e-yandex-cloud.yml @@ -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: @@ -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: @@ -712,7 +713,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: @@ -1208,7 +1209,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: @@ -1704,7 +1705,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: @@ -2200,7 +2201,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: @@ -2696,7 +2697,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: @@ -3192,7 +3193,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: From 2621c6738a4c795f1cfd93ed475b3940ec83256f Mon Sep 17 00:00:00 2001 From: Vladimir Portnov Date: Fri, 29 Nov 2024 13:25:08 +0800 Subject: [PATCH 2/2] removeme --- README.md | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bb1b8f107e..2eef9dec91 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ - Easy to start: you need a couple of CLI commands and 8 minutes to get production-ready Kubernetes. - A fully-featured platform. Many features *(check the diagram below)* — carefully configured & integrated — are available right out of the box. -_Deckhouse Platform [has passed](https://landscape.cncf.io/?view-mode=card&item=platform--certified-kubernetes-distribution--flant-deckhouse#app-definition-and-development--application-definition-image-build) the CNCF Certified Kubernetes Conformance Program certification for Kubernetes 1.26—1.30._ +*Deckhouse Platform [has passed](https://landscape.cncf.io/?view-mode=card&item=platform--certified-kubernetes-distribution--flant-deckhouse#app-definition-and-development--application-definition-image-build) the CNCF Certified Kubernetes Conformance Program certification for Kubernetes 1.26—1.30.* A brief overview of essential Deckhouse Platform features, from infrastructure level to the platform: @@ -54,7 +54,15 @@ If anything works in an unexpected manner or you have any questions, feel free t In addition to common GitHub features, here are some other online resources related to Deckhouse: -* [Twitter](https://twitter.com/deckhouseio) to stay informed about everything happening around Deckhouse; -* [Telegram chat](https://t.me/deckhouse) to discuss (there's a dedicated [Telegram chat in Russian](https://t.me/deckhouse_ru) as well); -* [Deckhouse blog](https://blog.deckhouse.io/) to read the latest articles about Deckhouse. -* Check our [work board](https://github.com/orgs/deckhouse/projects/2) and [roadmap](https://github.com/orgs/deckhouse/projects/6) for more insights. +- [Twitter](https://twitter.com/deckhouseio) to stay informed about everything happening around Deckhouse; +- [Telegram chat](https://t.me/deckhouse) to discuss (there's a dedicated [Telegram chat in Russian](https://t.me/deckhouse_ru) as well); +- [Deckhouse blog](https://blog.deckhouse.io/) to read the latest articles about Deckhouse. +- Check our [work board](https://github.com/orgs/deckhouse/projects/2) and [roadmap](https://github.com/orgs/deckhouse/projects/6) for more insights. + + + + + + + +