From 9a9e07db896f6f5549b7a8e62383601c4890a3d7 Mon Sep 17 00:00:00 2001 From: Nikolay Gorbatov Date: Thu, 28 Nov 2024 15:25:48 +0300 Subject: [PATCH] + Signed-off-by: Nikolay Gorbatov --- .github/ci_templates/helper_jobs.yml | 2 +- .github/scripts/js/constants.js | 6 ++-- .../workflow_templates/build-and-test_dev.yml | 4 +-- .../build-and-test_release.yml | 6 ++-- .../deploy-channel.multi.yml | 14 +++++----- .../suspend-channel.multi.yml | 4 +-- .github/workflows/build-and-test_dev.yml | 6 ++-- .github/workflows/build-and-test_release.yml | 10 +++---- .github/workflows/deploy-alpha.yml | 28 +++++++++---------- .github/workflows/deploy-beta.yml | 28 +++++++++---------- .github/workflows/deploy-early-access.yml | 28 +++++++++---------- .github/workflows/deploy-rock-solid.yml | 28 +++++++++---------- .github/workflows/deploy-stable.yml | 28 +++++++++---------- .github/workflows/on-pull-request-labeled.yml | 2 +- .github/workflows/suspend-alpha.yml | 18 ++++++------ .github/workflows/suspend-beta.yml | 18 ++++++------ .github/workflows/suspend-early-access.yml | 18 ++++++------ .github/workflows/suspend-rock-solid.yml | 18 ++++++------ .github/workflows/suspend-stable.yml | 18 ++++++------ .github/workflows/validation.yml | 2 +- 20 files changed, 143 insertions(+), 143 deletions(-) diff --git a/.github/ci_templates/helper_jobs.yml b/.github/ci_templates/helper_jobs.yml index 9053e98251..2748a9b6fd 100644 --- a/.github/ci_templates/helper_jobs.yml +++ b/.github/ci_templates/helper_jobs.yml @@ -267,7 +267,7 @@ pull_request_info: } else if (hasSE) { edition = 'SE'; } else if (hasSE_plus) { - edition = 'SE+'; + edition = 'SE-plus'; } core.info(`Edition labels: 'edition/ce':${hasCE}, 'edition/ee':${hasEE}, 'edition/be':${hasBE}, 'edition/se':${hasSE}, 'edition/se+':${hasSE_plus}`); core.notice(`Enable '${edition}' edition for '${context.eventName}' trigger.`); diff --git a/.github/scripts/js/constants.js b/.github/scripts/js/constants.js index b4a73e8128..2e1a92f8c3 100644 --- a/.github/scripts/js/constants.js +++ b/.github/scripts/js/constants.js @@ -55,7 +55,7 @@ const labels = { '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/se+': { type: 'e2e-edition', edition: 'SE+' }, + 'e2e/use/edition/se+': { type: 'e2e-edition', edition: 'SE-plus' }, 'e2e/use/edition/fe': { type: 'e2e-edition', edition: 'FE' }, // Allow running workflows for external PRs. @@ -70,7 +70,7 @@ const labels = { 'edition/ee': { type: 'edition', edition: 'EE' }, 'edition/be': { type: 'edition', edition: 'BE' }, 'edition/se': { type: 'edition', edition: 'SE' }, - 'edition/se+': { type: 'edition', edition: 'SE+' } + 'edition/se+': { type: 'edition', edition: 'SE-plus' } }; module.exports.knownLabels = labels; @@ -166,6 +166,6 @@ const editions = [ 'FE', 'BE', 'SE', - 'SE+' + 'SE-plus' ]; module.exports.knownEditions = editions; diff --git a/.github/workflow_templates/build-and-test_dev.yml b/.github/workflow_templates/build-and-test_dev.yml index 7c8e16e543..9902bb57bc 100644 --- a/.github/workflow_templates/build-and-test_dev.yml +++ b/.github/workflow_templates/build-and-test_dev.yml @@ -87,8 +87,8 @@ jobs: echo Enable ${{ needs.pull_request_info.outputs.edition }} enable_se_plus: - if: ${{ needs.pull_request_info.outputs.edition == 'SE+' }} - name: Enable SE+ + if: ${{ needs.pull_request_info.outputs.edition == 'SE-plus' }} + name: Enable SE-plus needs: - pull_request_info runs-on: ubuntu-latest diff --git a/.github/workflow_templates/build-and-test_release.yml b/.github/workflow_templates/build-and-test_release.yml index e5a90b4c8f..727ba0ee40 100644 --- a/.github/workflow_templates/build-and-test_release.yml +++ b/.github/workflow_templates/build-and-test_release.yml @@ -120,7 +120,7 @@ jobs: {!{ tmpl.Exec "build_template" (slice $ctx "release") | strings.Indent 4 }!} {!{ tmpl.Exec "update_comment_on_finish" (slice "job,one-line" $jobNames.build_se) | strings.Indent 6 }!} -{!{ $jobNames = coll.Merge $jobNames (dict "build_se_plus" "Build SE+") }!} +{!{ $jobNames = coll.Merge $jobNames (dict "build_se_plus" "Build SE-plus") }!} build_se_plus: name: {!{ $jobNames.build_se_plus }!} needs: @@ -128,9 +128,9 @@ jobs: - go_generate - workflow_render - build_fe - if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.inputs.editions, 'se+') }} + if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.inputs.editions, 'se-plus') }} env: - WERF_ENV: "SE+" + WERF_ENV: "SE-plus" {!{ tmpl.Exec "build_template" (slice $ctx "release") | strings.Indent 4 }!} {!{ tmpl.Exec "update_comment_on_finish" (slice "job,one-line" $jobNames.build_se_plus) | strings.Indent 6 }!} diff --git a/.github/workflow_templates/deploy-channel.multi.yml b/.github/workflow_templates/deploy-channel.multi.yml index a1543e1149..aab9e45b68 100644 --- a/.github/workflow_templates/deploy-channel.multi.yml +++ b/.github/workflow_templates/deploy-channel.multi.yml @@ -62,7 +62,7 @@ on: description: 'Id of comment in issue where to put workflow run status' required: false editions: - description: 'Comma separated editions to deploy. Example: ee,fe,ce,be,se,se+' + description: 'Comma separated editions to deploy. Example: ee,fe,ce,be,se,se-plus' required: false cooldown: description: 'Postpone release until specified datetime (YYYY-MM-DD HH:MM) UTC only. Example: 2026-06-06 16:16' @@ -84,7 +84,7 @@ jobs: DEPLOY_FE: ${{steps.detect_editions.outputs.DEPLOY_FE}} DEPLOY_BE: ${{steps.detect_editions.outputs.DEPLOY_BE}} DEPLOY_SE: ${{steps.detect_editions.outputs.DEPLOY_SE}} - DEPLOY_SE+: ${{steps.detect_editions.outputs.DEPLOY_SE+}} + DEPLOY_SE-plus: ${{steps.detect_editions.outputs.DEPLOY_SE-plus}} steps: - name: Detect editions id: detect_editions @@ -95,7 +95,7 @@ jobs: RESTRICTED=no - for edition in CE EE FE BE SE SE+ ; do + for edition in CE EE FE BE SE SE-plus ; do if grep -i ",${edition}," <<<",${EDITIONS}," 2>/dev/null 1>&2 ; then echo " - enable deploy of ${edition} edition." echo "DEPLOY_${edition}=true" >> $GITHUB_OUTPUT @@ -105,7 +105,7 @@ jobs: if [[ $RESTRICTED == "no" ]] ; then echo "No restrictions. Enable deploy to all editions." - for edition in CE EE FE BE SE SE+ ; do + for edition in CE EE FE BE SE SE-plus ; do echo "DEPLOY_${edition}=true" >> $GITHUB_OUTPUT done fi @@ -113,7 +113,7 @@ jobs: {!{/* Jobs for visual control allowed editions when approving deploy to environments. */}!} -{!{ range $werfEnv := slice "CE" "EE" "FE" "BE" "SE" "SE+" }!} +{!{ range $werfEnv := slice "CE" "EE" "FE" "BE" "SE" "SE-plus" }!} enable_{!{$werfEnv}!}: if: ${{ needs.detect_editions.outputs.DEPLOY_{!{$werfEnv}!} == 'true' }} name: Enable {!{$werfEnv}!} @@ -176,7 +176,7 @@ Jobs for visual control allowed editions when approving deploy to environments. exit 1 fi - {!{ range $werfEnv := slice "CE" "EE" "FE" "BE" "SE" "SE+" }!} + {!{ range $werfEnv := slice "CE" "EE" "FE" "BE" "SE" "SE-plus" }!} - name: Set cooldown for release ({!{ $werfEnv }!}) if: ${{ github.event.inputs.cooldown }} env: @@ -217,7 +217,7 @@ Registries: Job supports running from forked or copied repo: 'ghcr.io/owner/repo' is used if DECKHOUSE_REGISTRY_HOST is not set. */}!} -{!{ range $werfEnv := slice "CE" "EE" "FE" "BE" "SE" "SE+" }!} +{!{ range $werfEnv := slice "CE" "EE" "FE" "BE" "SE" "SE-plus" }!} - name: Publish release images for {!{ $werfEnv }!} if: ${{ needs.detect_editions.outputs.DEPLOY_{!{ $werfEnv }!} == 'true' }} env: diff --git a/.github/workflow_templates/suspend-channel.multi.yml b/.github/workflow_templates/suspend-channel.multi.yml index 28672eb0e1..0e6c499ead 100644 --- a/.github/workflow_templates/suspend-channel.multi.yml +++ b/.github/workflow_templates/suspend-channel.multi.yml @@ -127,7 +127,7 @@ Destination registries: - DECKHOUSE_REGISTRY_HOST - DEV_REGISTRY_PATH */}!} -{!{ range $werfEnv := slice "CE" "EE" "FE" "BE" "SE" "SE+" }!} +{!{ range $werfEnv := slice "CE" "EE" "FE" "BE" "SE" "SE-plus" }!} - name: Publish release images for {!{ $werfEnv }!} env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} @@ -181,7 +181,7 @@ Destination registries: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL={!{ $channel }!} diff --git a/.github/workflows/build-and-test_dev.yml b/.github/workflows/build-and-test_dev.yml index cc12c13f90..60e5ec8858 100644 --- a/.github/workflows/build-and-test_dev.yml +++ b/.github/workflows/build-and-test_dev.yml @@ -213,7 +213,7 @@ jobs: } else if (hasSE) { edition = 'SE'; } else if (hasSE_plus) { - edition = 'SE+'; + edition = 'SE-plus'; } core.info(`Edition labels: 'edition/ce':${hasCE}, 'edition/ee':${hasEE}, 'edition/be':${hasBE}, 'edition/se':${hasSE}, 'edition/se+':${hasSE_plus}`); core.notice(`Enable '${edition}' edition for '${context.eventName}' trigger.`); @@ -416,8 +416,8 @@ jobs: echo Enable ${{ needs.pull_request_info.outputs.edition }} enable_se_plus: - if: ${{ needs.pull_request_info.outputs.edition == 'SE+' }} - name: Enable SE+ + if: ${{ needs.pull_request_info.outputs.edition == 'SE-plus' }} + name: Enable SE-plus needs: - pull_request_info runs-on: ubuntu-latest diff --git a/.github/workflows/build-and-test_release.yml b/.github/workflows/build-and-test_release.yml index 92505e2e80..52e54627ea 100644 --- a/.github/workflows/build-and-test_release.yml +++ b/.github/workflows/build-and-test_release.yml @@ -1344,15 +1344,15 @@ jobs: build_se_plus: - name: Build SE+ + name: Build SE-plus needs: - git_info - go_generate - workflow_render - build_fe - if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.inputs.editions, 'se+') }} + if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.inputs.editions, 'se-plus') }} env: - WERF_ENV: "SE+" + WERF_ENV: "SE-plus" # runs-on: [self-hosted, regular, selectel] outputs: @@ -1649,7 +1649,7 @@ jobs: retries: 3 script: | const statusConfig = 'job,one-line'; - const name = 'Build SE+'; + const name = 'Build SE-plus'; const needsContext = JSON.parse(process.env.NEEDS_CONTEXT); const jobContext = JSON.parse(process.env.JOB_CONTEXT); const stepsContext = JSON.parse(process.env.STEPS_CONTEXT); @@ -3720,7 +3720,7 @@ jobs: runs-on: ubuntu-latest env: JOB_NAMES: | - {"build_be":"Build BE","build_ce":"Build CE","build_ee":"Build EE","build_fe":"Build FE","build_se":"Build SE","build_se_plus":"Build SE+","deploy_latest_web_doc_prod_sel":"(Prod) Deploy latest doc","deploy_latest_web_site_prod_sel":"(Prod) Deploy latest site","dhctl_tests":"Dhctl Tests","doc_web_build":"Doc web build","go_generate":"Go Generate","golangci_lint":"GolangCI Lint","main_web_build":"Main web build","matrix_tests":"Matrix tests","openapi_test_cases":"OpenAPI Test Cases","tests":"Tests","validators":"Validators","web_links_test":"Web links test","workflow_render":"Render workflow"} + {"build_be":"Build BE","build_ce":"Build CE","build_ee":"Build EE","build_fe":"Build FE","build_se":"Build SE","build_se_plus":"Build SE-plus","deploy_latest_web_doc_prod_sel":"(Prod) Deploy latest doc","deploy_latest_web_site_prod_sel":"(Prod) Deploy latest site","dhctl_tests":"Dhctl Tests","doc_web_build":"Doc web build","go_generate":"Go Generate","golangci_lint":"GolangCI Lint","main_web_build":"Main web build","matrix_tests":"Matrix tests","openapi_test_cases":"OpenAPI Test Cases","tests":"Tests","validators":"Validators","web_links_test":"Web links test","workflow_render":"Render workflow"} steps: # diff --git a/.github/workflows/deploy-alpha.yml b/.github/workflows/deploy-alpha.yml index b2512c0f2c..65f6be30df 100644 --- a/.github/workflows/deploy-alpha.yml +++ b/.github/workflows/deploy-alpha.yml @@ -32,7 +32,7 @@ on: description: 'Id of comment in issue where to put workflow run status' required: false editions: - description: 'Comma separated editions to deploy. Example: ee,fe,ce,be,se,se+' + description: 'Comma separated editions to deploy. Example: ee,fe,ce,be,se,se-plus' required: false cooldown: description: 'Postpone release until specified datetime (YYYY-MM-DD HH:MM) UTC only. Example: 2026-06-06 16:16' @@ -140,7 +140,7 @@ jobs: DEPLOY_FE: ${{steps.detect_editions.outputs.DEPLOY_FE}} DEPLOY_BE: ${{steps.detect_editions.outputs.DEPLOY_BE}} DEPLOY_SE: ${{steps.detect_editions.outputs.DEPLOY_SE}} - DEPLOY_SE+: ${{steps.detect_editions.outputs.DEPLOY_SE+}} + DEPLOY_SE-plus: ${{steps.detect_editions.outputs.DEPLOY_SE-plus}} steps: - name: Detect editions id: detect_editions @@ -151,7 +151,7 @@ jobs: RESTRICTED=no - for edition in CE EE FE BE SE SE+ ; do + for edition in CE EE FE BE SE SE-plus ; do if grep -i ",${edition}," <<<",${EDITIONS}," 2>/dev/null 1>&2 ; then echo " - enable deploy of ${edition} edition." echo "DEPLOY_${edition}=true" >> $GITHUB_OUTPUT @@ -161,7 +161,7 @@ jobs: if [[ $RESTRICTED == "no" ]] ; then echo "No restrictions. Enable deploy to all editions." - for edition in CE EE FE BE SE SE+ ; do + for edition in CE EE FE BE SE SE-plus ; do echo "DEPLOY_${edition}=true" >> $GITHUB_OUTPUT done fi @@ -213,14 +213,14 @@ jobs: steps: - run: ": Enable SE" - enable_SE+: - if: ${{ needs.detect_editions.outputs.DEPLOY_SE+ == 'true' }} - name: Enable SE+ + enable_SE-plus: + if: ${{ needs.detect_editions.outputs.DEPLOY_SE-plus == 'true' }} + name: Enable SE-plus needs: - detect_editions runs-on: ubuntu-latest steps: - - run: ": Enable SE+" + - run: ": Enable SE-plus" run_deploy: @@ -473,12 +473,12 @@ jobs: echo "⚓️ 📤 [$(date -u)] Push '${SOURCE_RELEASE_VERSION_IMAGE}' image with cooldown." docker image push ${SOURCE_RELEASE_VERSION_IMAGE} - - name: Set cooldown for release (SE+) + - name: Set cooldown for release (SE-plus) if: ${{ github.event.inputs.cooldown }} env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} CI_COMMIT_TAG: ${{needs.git_info.outputs.ci_commit_tag}} - WERF_ENV: SE+ + WERF_ENV: SE-plus COOLDOWN: ${{ github.event.inputs.cooldown }} run: | PROD_REGISTRY_PATH="${DECKHOUSE_REGISTRY_HOST}/deckhouse" @@ -1152,13 +1152,13 @@ jobs: echo "Release version image:" echo " Source: ${SOURCE_RELEASE_VERSION_IMAGE}" echo " Prod: ${PROD_RELEASE_VERSION_IMAGE}" - - name: Publish release images for SE+ - if: ${{ needs.detect_editions.outputs.DEPLOY_SE+ == 'true' }} + - name: Publish release images for SE-plus + if: ${{ needs.detect_editions.outputs.DEPLOY_SE-plus == 'true' }} env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} CI_COMMIT_TAG: ${{needs.git_info.outputs.ci_commit_tag}} CI_COMMIT_BRANCH: ${{needs.git_info.outputs.ci_commit_branch}} - WERF_ENV: SE+ + WERF_ENV: SE-plus SKIP_PUSH_FOR_DEPLOY: ${{secrets.SKIP_PUSH_FOR_DEPLOY}} run: | # SRC_NAME is a name of image from werf.yaml. @@ -1208,7 +1208,7 @@ jobs: exit 1 fi - echo "Publish SE+ edition". + echo "Publish SE-plus edition". # Variables # 1. Edition and channel. diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml index b3a29f7c94..0b1b81a0b7 100644 --- a/.github/workflows/deploy-beta.yml +++ b/.github/workflows/deploy-beta.yml @@ -32,7 +32,7 @@ on: description: 'Id of comment in issue where to put workflow run status' required: false editions: - description: 'Comma separated editions to deploy. Example: ee,fe,ce,be,se,se+' + description: 'Comma separated editions to deploy. Example: ee,fe,ce,be,se,se-plus' required: false cooldown: description: 'Postpone release until specified datetime (YYYY-MM-DD HH:MM) UTC only. Example: 2026-06-06 16:16' @@ -140,7 +140,7 @@ jobs: DEPLOY_FE: ${{steps.detect_editions.outputs.DEPLOY_FE}} DEPLOY_BE: ${{steps.detect_editions.outputs.DEPLOY_BE}} DEPLOY_SE: ${{steps.detect_editions.outputs.DEPLOY_SE}} - DEPLOY_SE+: ${{steps.detect_editions.outputs.DEPLOY_SE+}} + DEPLOY_SE-plus: ${{steps.detect_editions.outputs.DEPLOY_SE-plus}} steps: - name: Detect editions id: detect_editions @@ -151,7 +151,7 @@ jobs: RESTRICTED=no - for edition in CE EE FE BE SE SE+ ; do + for edition in CE EE FE BE SE SE-plus ; do if grep -i ",${edition}," <<<",${EDITIONS}," 2>/dev/null 1>&2 ; then echo " - enable deploy of ${edition} edition." echo "DEPLOY_${edition}=true" >> $GITHUB_OUTPUT @@ -161,7 +161,7 @@ jobs: if [[ $RESTRICTED == "no" ]] ; then echo "No restrictions. Enable deploy to all editions." - for edition in CE EE FE BE SE SE+ ; do + for edition in CE EE FE BE SE SE-plus ; do echo "DEPLOY_${edition}=true" >> $GITHUB_OUTPUT done fi @@ -213,14 +213,14 @@ jobs: steps: - run: ": Enable SE" - enable_SE+: - if: ${{ needs.detect_editions.outputs.DEPLOY_SE+ == 'true' }} - name: Enable SE+ + enable_SE-plus: + if: ${{ needs.detect_editions.outputs.DEPLOY_SE-plus == 'true' }} + name: Enable SE-plus needs: - detect_editions runs-on: ubuntu-latest steps: - - run: ": Enable SE+" + - run: ": Enable SE-plus" run_deploy: @@ -473,12 +473,12 @@ jobs: echo "⚓️ 📤 [$(date -u)] Push '${SOURCE_RELEASE_VERSION_IMAGE}' image with cooldown." docker image push ${SOURCE_RELEASE_VERSION_IMAGE} - - name: Set cooldown for release (SE+) + - name: Set cooldown for release (SE-plus) if: ${{ github.event.inputs.cooldown }} env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} CI_COMMIT_TAG: ${{needs.git_info.outputs.ci_commit_tag}} - WERF_ENV: SE+ + WERF_ENV: SE-plus COOLDOWN: ${{ github.event.inputs.cooldown }} run: | PROD_REGISTRY_PATH="${DECKHOUSE_REGISTRY_HOST}/deckhouse" @@ -1152,13 +1152,13 @@ jobs: echo "Release version image:" echo " Source: ${SOURCE_RELEASE_VERSION_IMAGE}" echo " Prod: ${PROD_RELEASE_VERSION_IMAGE}" - - name: Publish release images for SE+ - if: ${{ needs.detect_editions.outputs.DEPLOY_SE+ == 'true' }} + - name: Publish release images for SE-plus + if: ${{ needs.detect_editions.outputs.DEPLOY_SE-plus == 'true' }} env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} CI_COMMIT_TAG: ${{needs.git_info.outputs.ci_commit_tag}} CI_COMMIT_BRANCH: ${{needs.git_info.outputs.ci_commit_branch}} - WERF_ENV: SE+ + WERF_ENV: SE-plus SKIP_PUSH_FOR_DEPLOY: ${{secrets.SKIP_PUSH_FOR_DEPLOY}} run: | # SRC_NAME is a name of image from werf.yaml. @@ -1208,7 +1208,7 @@ jobs: exit 1 fi - echo "Publish SE+ edition". + echo "Publish SE-plus edition". # Variables # 1. Edition and channel. diff --git a/.github/workflows/deploy-early-access.yml b/.github/workflows/deploy-early-access.yml index 7015e332bb..973163ce97 100644 --- a/.github/workflows/deploy-early-access.yml +++ b/.github/workflows/deploy-early-access.yml @@ -32,7 +32,7 @@ on: description: 'Id of comment in issue where to put workflow run status' required: false editions: - description: 'Comma separated editions to deploy. Example: ee,fe,ce,be,se,se+' + description: 'Comma separated editions to deploy. Example: ee,fe,ce,be,se,se-plus' required: false cooldown: description: 'Postpone release until specified datetime (YYYY-MM-DD HH:MM) UTC only. Example: 2026-06-06 16:16' @@ -140,7 +140,7 @@ jobs: DEPLOY_FE: ${{steps.detect_editions.outputs.DEPLOY_FE}} DEPLOY_BE: ${{steps.detect_editions.outputs.DEPLOY_BE}} DEPLOY_SE: ${{steps.detect_editions.outputs.DEPLOY_SE}} - DEPLOY_SE+: ${{steps.detect_editions.outputs.DEPLOY_SE+}} + DEPLOY_SE-plus: ${{steps.detect_editions.outputs.DEPLOY_SE-plus}} steps: - name: Detect editions id: detect_editions @@ -151,7 +151,7 @@ jobs: RESTRICTED=no - for edition in CE EE FE BE SE SE+ ; do + for edition in CE EE FE BE SE SE-plus ; do if grep -i ",${edition}," <<<",${EDITIONS}," 2>/dev/null 1>&2 ; then echo " - enable deploy of ${edition} edition." echo "DEPLOY_${edition}=true" >> $GITHUB_OUTPUT @@ -161,7 +161,7 @@ jobs: if [[ $RESTRICTED == "no" ]] ; then echo "No restrictions. Enable deploy to all editions." - for edition in CE EE FE BE SE SE+ ; do + for edition in CE EE FE BE SE SE-plus ; do echo "DEPLOY_${edition}=true" >> $GITHUB_OUTPUT done fi @@ -213,14 +213,14 @@ jobs: steps: - run: ": Enable SE" - enable_SE+: - if: ${{ needs.detect_editions.outputs.DEPLOY_SE+ == 'true' }} - name: Enable SE+ + enable_SE-plus: + if: ${{ needs.detect_editions.outputs.DEPLOY_SE-plus == 'true' }} + name: Enable SE-plus needs: - detect_editions runs-on: ubuntu-latest steps: - - run: ": Enable SE+" + - run: ": Enable SE-plus" run_deploy: @@ -473,12 +473,12 @@ jobs: echo "⚓️ 📤 [$(date -u)] Push '${SOURCE_RELEASE_VERSION_IMAGE}' image with cooldown." docker image push ${SOURCE_RELEASE_VERSION_IMAGE} - - name: Set cooldown for release (SE+) + - name: Set cooldown for release (SE-plus) if: ${{ github.event.inputs.cooldown }} env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} CI_COMMIT_TAG: ${{needs.git_info.outputs.ci_commit_tag}} - WERF_ENV: SE+ + WERF_ENV: SE-plus COOLDOWN: ${{ github.event.inputs.cooldown }} run: | PROD_REGISTRY_PATH="${DECKHOUSE_REGISTRY_HOST}/deckhouse" @@ -1152,13 +1152,13 @@ jobs: echo "Release version image:" echo " Source: ${SOURCE_RELEASE_VERSION_IMAGE}" echo " Prod: ${PROD_RELEASE_VERSION_IMAGE}" - - name: Publish release images for SE+ - if: ${{ needs.detect_editions.outputs.DEPLOY_SE+ == 'true' }} + - name: Publish release images for SE-plus + if: ${{ needs.detect_editions.outputs.DEPLOY_SE-plus == 'true' }} env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} CI_COMMIT_TAG: ${{needs.git_info.outputs.ci_commit_tag}} CI_COMMIT_BRANCH: ${{needs.git_info.outputs.ci_commit_branch}} - WERF_ENV: SE+ + WERF_ENV: SE-plus SKIP_PUSH_FOR_DEPLOY: ${{secrets.SKIP_PUSH_FOR_DEPLOY}} run: | # SRC_NAME is a name of image from werf.yaml. @@ -1208,7 +1208,7 @@ jobs: exit 1 fi - echo "Publish SE+ edition". + echo "Publish SE-plus edition". # Variables # 1. Edition and channel. diff --git a/.github/workflows/deploy-rock-solid.yml b/.github/workflows/deploy-rock-solid.yml index 846b1a4fa0..12368a55f7 100644 --- a/.github/workflows/deploy-rock-solid.yml +++ b/.github/workflows/deploy-rock-solid.yml @@ -32,7 +32,7 @@ on: description: 'Id of comment in issue where to put workflow run status' required: false editions: - description: 'Comma separated editions to deploy. Example: ee,fe,ce,be,se,se+' + description: 'Comma separated editions to deploy. Example: ee,fe,ce,be,se,se-plus' required: false cooldown: description: 'Postpone release until specified datetime (YYYY-MM-DD HH:MM) UTC only. Example: 2026-06-06 16:16' @@ -140,7 +140,7 @@ jobs: DEPLOY_FE: ${{steps.detect_editions.outputs.DEPLOY_FE}} DEPLOY_BE: ${{steps.detect_editions.outputs.DEPLOY_BE}} DEPLOY_SE: ${{steps.detect_editions.outputs.DEPLOY_SE}} - DEPLOY_SE+: ${{steps.detect_editions.outputs.DEPLOY_SE+}} + DEPLOY_SE-plus: ${{steps.detect_editions.outputs.DEPLOY_SE-plus}} steps: - name: Detect editions id: detect_editions @@ -151,7 +151,7 @@ jobs: RESTRICTED=no - for edition in CE EE FE BE SE SE+ ; do + for edition in CE EE FE BE SE SE-plus ; do if grep -i ",${edition}," <<<",${EDITIONS}," 2>/dev/null 1>&2 ; then echo " - enable deploy of ${edition} edition." echo "DEPLOY_${edition}=true" >> $GITHUB_OUTPUT @@ -161,7 +161,7 @@ jobs: if [[ $RESTRICTED == "no" ]] ; then echo "No restrictions. Enable deploy to all editions." - for edition in CE EE FE BE SE SE+ ; do + for edition in CE EE FE BE SE SE-plus ; do echo "DEPLOY_${edition}=true" >> $GITHUB_OUTPUT done fi @@ -213,14 +213,14 @@ jobs: steps: - run: ": Enable SE" - enable_SE+: - if: ${{ needs.detect_editions.outputs.DEPLOY_SE+ == 'true' }} - name: Enable SE+ + enable_SE-plus: + if: ${{ needs.detect_editions.outputs.DEPLOY_SE-plus == 'true' }} + name: Enable SE-plus needs: - detect_editions runs-on: ubuntu-latest steps: - - run: ": Enable SE+" + - run: ": Enable SE-plus" run_deploy: @@ -473,12 +473,12 @@ jobs: echo "⚓️ 📤 [$(date -u)] Push '${SOURCE_RELEASE_VERSION_IMAGE}' image with cooldown." docker image push ${SOURCE_RELEASE_VERSION_IMAGE} - - name: Set cooldown for release (SE+) + - name: Set cooldown for release (SE-plus) if: ${{ github.event.inputs.cooldown }} env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} CI_COMMIT_TAG: ${{needs.git_info.outputs.ci_commit_tag}} - WERF_ENV: SE+ + WERF_ENV: SE-plus COOLDOWN: ${{ github.event.inputs.cooldown }} run: | PROD_REGISTRY_PATH="${DECKHOUSE_REGISTRY_HOST}/deckhouse" @@ -1152,13 +1152,13 @@ jobs: echo "Release version image:" echo " Source: ${SOURCE_RELEASE_VERSION_IMAGE}" echo " Prod: ${PROD_RELEASE_VERSION_IMAGE}" - - name: Publish release images for SE+ - if: ${{ needs.detect_editions.outputs.DEPLOY_SE+ == 'true' }} + - name: Publish release images for SE-plus + if: ${{ needs.detect_editions.outputs.DEPLOY_SE-plus == 'true' }} env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} CI_COMMIT_TAG: ${{needs.git_info.outputs.ci_commit_tag}} CI_COMMIT_BRANCH: ${{needs.git_info.outputs.ci_commit_branch}} - WERF_ENV: SE+ + WERF_ENV: SE-plus SKIP_PUSH_FOR_DEPLOY: ${{secrets.SKIP_PUSH_FOR_DEPLOY}} run: | # SRC_NAME is a name of image from werf.yaml. @@ -1208,7 +1208,7 @@ jobs: exit 1 fi - echo "Publish SE+ edition". + echo "Publish SE-plus edition". # Variables # 1. Edition and channel. diff --git a/.github/workflows/deploy-stable.yml b/.github/workflows/deploy-stable.yml index fa344cf54e..93786929b2 100644 --- a/.github/workflows/deploy-stable.yml +++ b/.github/workflows/deploy-stable.yml @@ -32,7 +32,7 @@ on: description: 'Id of comment in issue where to put workflow run status' required: false editions: - description: 'Comma separated editions to deploy. Example: ee,fe,ce,be,se,se+' + description: 'Comma separated editions to deploy. Example: ee,fe,ce,be,se,se-plus' required: false cooldown: description: 'Postpone release until specified datetime (YYYY-MM-DD HH:MM) UTC only. Example: 2026-06-06 16:16' @@ -140,7 +140,7 @@ jobs: DEPLOY_FE: ${{steps.detect_editions.outputs.DEPLOY_FE}} DEPLOY_BE: ${{steps.detect_editions.outputs.DEPLOY_BE}} DEPLOY_SE: ${{steps.detect_editions.outputs.DEPLOY_SE}} - DEPLOY_SE+: ${{steps.detect_editions.outputs.DEPLOY_SE+}} + DEPLOY_SE-plus: ${{steps.detect_editions.outputs.DEPLOY_SE-plus}} steps: - name: Detect editions id: detect_editions @@ -151,7 +151,7 @@ jobs: RESTRICTED=no - for edition in CE EE FE BE SE SE+ ; do + for edition in CE EE FE BE SE SE-plus ; do if grep -i ",${edition}," <<<",${EDITIONS}," 2>/dev/null 1>&2 ; then echo " - enable deploy of ${edition} edition." echo "DEPLOY_${edition}=true" >> $GITHUB_OUTPUT @@ -161,7 +161,7 @@ jobs: if [[ $RESTRICTED == "no" ]] ; then echo "No restrictions. Enable deploy to all editions." - for edition in CE EE FE BE SE SE+ ; do + for edition in CE EE FE BE SE SE-plus ; do echo "DEPLOY_${edition}=true" >> $GITHUB_OUTPUT done fi @@ -213,14 +213,14 @@ jobs: steps: - run: ": Enable SE" - enable_SE+: - if: ${{ needs.detect_editions.outputs.DEPLOY_SE+ == 'true' }} - name: Enable SE+ + enable_SE-plus: + if: ${{ needs.detect_editions.outputs.DEPLOY_SE-plus == 'true' }} + name: Enable SE-plus needs: - detect_editions runs-on: ubuntu-latest steps: - - run: ": Enable SE+" + - run: ": Enable SE-plus" run_deploy: @@ -473,12 +473,12 @@ jobs: echo "⚓️ 📤 [$(date -u)] Push '${SOURCE_RELEASE_VERSION_IMAGE}' image with cooldown." docker image push ${SOURCE_RELEASE_VERSION_IMAGE} - - name: Set cooldown for release (SE+) + - name: Set cooldown for release (SE-plus) if: ${{ github.event.inputs.cooldown }} env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} CI_COMMIT_TAG: ${{needs.git_info.outputs.ci_commit_tag}} - WERF_ENV: SE+ + WERF_ENV: SE-plus COOLDOWN: ${{ github.event.inputs.cooldown }} run: | PROD_REGISTRY_PATH="${DECKHOUSE_REGISTRY_HOST}/deckhouse" @@ -1152,13 +1152,13 @@ jobs: echo "Release version image:" echo " Source: ${SOURCE_RELEASE_VERSION_IMAGE}" echo " Prod: ${PROD_RELEASE_VERSION_IMAGE}" - - name: Publish release images for SE+ - if: ${{ needs.detect_editions.outputs.DEPLOY_SE+ == 'true' }} + - name: Publish release images for SE-plus + if: ${{ needs.detect_editions.outputs.DEPLOY_SE-plus == 'true' }} env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} CI_COMMIT_TAG: ${{needs.git_info.outputs.ci_commit_tag}} CI_COMMIT_BRANCH: ${{needs.git_info.outputs.ci_commit_branch}} - WERF_ENV: SE+ + WERF_ENV: SE-plus SKIP_PUSH_FOR_DEPLOY: ${{secrets.SKIP_PUSH_FOR_DEPLOY}} run: | # SRC_NAME is a name of image from werf.yaml. @@ -1208,7 +1208,7 @@ jobs: exit 1 fi - echo "Publish SE+ edition". + echo "Publish SE-plus edition". # Variables # 1. Edition and channel. diff --git a/.github/workflows/on-pull-request-labeled.yml b/.github/workflows/on-pull-request-labeled.yml index 7456471296..68f235070c 100644 --- a/.github/workflows/on-pull-request-labeled.yml +++ b/.github/workflows/on-pull-request-labeled.yml @@ -188,7 +188,7 @@ jobs: } else if (hasSE) { edition = 'SE'; } else if (hasSE_plus) { - edition = 'SE+'; + edition = 'SE-plus'; } core.info(`Edition labels: 'edition/ce':${hasCE}, 'edition/ee':${hasEE}, 'edition/be':${hasBE}, 'edition/se':${hasSE}, 'edition/se+':${hasSE_plus}`); core.notice(`Enable '${edition}' edition for '${context.eventName}' trigger.`); diff --git a/.github/workflows/suspend-alpha.yml b/.github/workflows/suspend-alpha.yml index d67561b8e7..9e65f5d65a 100644 --- a/.github/workflows/suspend-alpha.yml +++ b/.github/workflows/suspend-alpha.yml @@ -303,7 +303,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=alpha @@ -381,7 +381,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=alpha @@ -459,7 +459,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=alpha @@ -537,7 +537,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=alpha @@ -615,7 +615,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=alpha @@ -640,11 +640,11 @@ jobs: docker build . -t "${SUSPEND_VERSION_IMAGE}" push_rmi 'release-channel suspend' "${SUSPEND_VERSION_IMAGE}" - - name: Publish release images for SE+ + - name: Publish release images for SE-plus env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} SUSPEND_VERSION: ${{needs.detect_version.outputs.version}} - WERF_ENV: SE+ + WERF_ENV: SE-plus SKIP_PUSH_FOR_SUSPEND: ${{secrets.SKIP_PUSH_FOR_SUSPEND}} run: | # SRC_NAME is a name of image from werf.yaml. @@ -689,11 +689,11 @@ jobs: exit 1 fi - echo "Suspend version '${SUSPEND_VERSION}' for SE+ edition". + echo "Suspend version '${SUSPEND_VERSION}' for SE-plus edition". # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=alpha diff --git a/.github/workflows/suspend-beta.yml b/.github/workflows/suspend-beta.yml index 2c83286fb8..b4ab759131 100644 --- a/.github/workflows/suspend-beta.yml +++ b/.github/workflows/suspend-beta.yml @@ -303,7 +303,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=beta @@ -381,7 +381,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=beta @@ -459,7 +459,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=beta @@ -537,7 +537,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=beta @@ -615,7 +615,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=beta @@ -640,11 +640,11 @@ jobs: docker build . -t "${SUSPEND_VERSION_IMAGE}" push_rmi 'release-channel suspend' "${SUSPEND_VERSION_IMAGE}" - - name: Publish release images for SE+ + - name: Publish release images for SE-plus env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} SUSPEND_VERSION: ${{needs.detect_version.outputs.version}} - WERF_ENV: SE+ + WERF_ENV: SE-plus SKIP_PUSH_FOR_SUSPEND: ${{secrets.SKIP_PUSH_FOR_SUSPEND}} run: | # SRC_NAME is a name of image from werf.yaml. @@ -689,11 +689,11 @@ jobs: exit 1 fi - echo "Suspend version '${SUSPEND_VERSION}' for SE+ edition". + echo "Suspend version '${SUSPEND_VERSION}' for SE-plus edition". # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=beta diff --git a/.github/workflows/suspend-early-access.yml b/.github/workflows/suspend-early-access.yml index ce827896a3..dffff9243a 100644 --- a/.github/workflows/suspend-early-access.yml +++ b/.github/workflows/suspend-early-access.yml @@ -303,7 +303,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=early-access @@ -381,7 +381,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=early-access @@ -459,7 +459,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=early-access @@ -537,7 +537,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=early-access @@ -615,7 +615,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=early-access @@ -640,11 +640,11 @@ jobs: docker build . -t "${SUSPEND_VERSION_IMAGE}" push_rmi 'release-channel suspend' "${SUSPEND_VERSION_IMAGE}" - - name: Publish release images for SE+ + - name: Publish release images for SE-plus env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} SUSPEND_VERSION: ${{needs.detect_version.outputs.version}} - WERF_ENV: SE+ + WERF_ENV: SE-plus SKIP_PUSH_FOR_SUSPEND: ${{secrets.SKIP_PUSH_FOR_SUSPEND}} run: | # SRC_NAME is a name of image from werf.yaml. @@ -689,11 +689,11 @@ jobs: exit 1 fi - echo "Suspend version '${SUSPEND_VERSION}' for SE+ edition". + echo "Suspend version '${SUSPEND_VERSION}' for SE-plus edition". # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=early-access diff --git a/.github/workflows/suspend-rock-solid.yml b/.github/workflows/suspend-rock-solid.yml index abaf0d7402..ce6990644a 100644 --- a/.github/workflows/suspend-rock-solid.yml +++ b/.github/workflows/suspend-rock-solid.yml @@ -303,7 +303,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=rock-solid @@ -381,7 +381,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=rock-solid @@ -459,7 +459,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=rock-solid @@ -537,7 +537,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=rock-solid @@ -615,7 +615,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=rock-solid @@ -640,11 +640,11 @@ jobs: docker build . -t "${SUSPEND_VERSION_IMAGE}" push_rmi 'release-channel suspend' "${SUSPEND_VERSION_IMAGE}" - - name: Publish release images for SE+ + - name: Publish release images for SE-plus env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} SUSPEND_VERSION: ${{needs.detect_version.outputs.version}} - WERF_ENV: SE+ + WERF_ENV: SE-plus SKIP_PUSH_FOR_SUSPEND: ${{secrets.SKIP_PUSH_FOR_SUSPEND}} run: | # SRC_NAME is a name of image from werf.yaml. @@ -689,11 +689,11 @@ jobs: exit 1 fi - echo "Suspend version '${SUSPEND_VERSION}' for SE+ edition". + echo "Suspend version '${SUSPEND_VERSION}' for SE-plus edition". # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=rock-solid diff --git a/.github/workflows/suspend-stable.yml b/.github/workflows/suspend-stable.yml index 78a12b47dc..47d8854fd4 100644 --- a/.github/workflows/suspend-stable.yml +++ b/.github/workflows/suspend-stable.yml @@ -303,7 +303,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=stable @@ -381,7 +381,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=stable @@ -459,7 +459,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=stable @@ -537,7 +537,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=stable @@ -615,7 +615,7 @@ jobs: # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=stable @@ -640,11 +640,11 @@ jobs: docker build . -t "${SUSPEND_VERSION_IMAGE}" push_rmi 'release-channel suspend' "${SUSPEND_VERSION_IMAGE}" - - name: Publish release images for SE+ + - name: Publish release images for SE-plus env: DECKHOUSE_REGISTRY_HOST: ${{secrets.DECKHOUSE_REGISTRY_HOST}} SUSPEND_VERSION: ${{needs.detect_version.outputs.version}} - WERF_ENV: SE+ + WERF_ENV: SE-plus SKIP_PUSH_FOR_SUSPEND: ${{secrets.SKIP_PUSH_FOR_SUSPEND}} run: | # SRC_NAME is a name of image from werf.yaml. @@ -689,11 +689,11 @@ jobs: exit 1 fi - echo "Suspend version '${SUSPEND_VERSION}' for SE+ edition". + echo "Suspend version '${SUSPEND_VERSION}' for SE-plus edition". # Variables # 1. Edition and channel. - # CE/EE/FE/BE/SE/SE+ -> ce/ee/fe/be/se/se+ + # CE/EE/FE/BE/SE/SE-plus -> ce/ee/fe/be/se/se-plus REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]') RELEASE_CHANNEL=stable diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index e53377cc75..52d57db683 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -228,7 +228,7 @@ jobs: } else if (hasSE) { edition = 'SE'; } else if (hasSE_plus) { - edition = 'SE+'; + edition = 'SE-plus'; } core.info(`Edition labels: 'edition/ce':${hasCE}, 'edition/ee':${hasEE}, 'edition/be':${hasBE}, 'edition/se':${hasSE}, 'edition/se+':${hasSE_plus}`); core.notice(`Enable '${edition}' edition for '${context.eventName}' trigger.`);