Skip to content

Commit

Permalink
fix wf
Browse files Browse the repository at this point in the history
Signed-off-by: Nikolay Gorbatov <nikolay.gorbatov@flant.com>
  • Loading branch information
sprait committed Mar 19, 2024
1 parent ee8858b commit e5dd683
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflow_templates/deploy-channel.multi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Jobs for visual control allowed editions when approving deploy to environments.
echo "enable=true" >> $GITHUB_OUTPUT
fi
{!{ range $werfEnv := slice "CE" "EE" "FE" "BE" }!}
{!{ range $werfEnv := slice "CE" "EE" "FE" "BE" "SE" }!}
- name: Set cooldown for release ({!{ $werfEnv }!})
if: ${{ github.event.inputs.cooldown }}
env:
Expand Down
22 changes: 12 additions & 10 deletions .github/workflows/build-and-test_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -953,15 +953,15 @@ jobs:
# </template: update_comment_on_finish>


build_be:
name: Build BE
build_se:
name: Build SE
needs:
- git_info
- go_generate
- workflow_render
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
env:
WERF_ENV: "BE"
WERF_ENV: "SE"
# <template: build_template>
runs-on: [self-hosted, regular]
outputs:
Expand Down Expand Up @@ -1230,7 +1230,7 @@ jobs:
retries: 3
script: |
const statusConfig = 'job,one-line';
const name = 'Build BE';
const name = 'Build SE';
const needsContext = JSON.parse(process.env.NEEDS_CONTEXT);
const jobContext = JSON.parse(process.env.JOB_CONTEXT);
const stepsContext = JSON.parse(process.env.STEPS_CONTEXT);
Expand All @@ -1248,15 +1248,16 @@ jobs:
return await ci.updateCommentOnFinish({github, context, core, statusConfig, name, needsContext, jobContext, stepsContext, jobNames});
# </template: update_comment_on_finish>

build_se:
name: Build SE

build_be:
name: Build BE
needs:
- git_info
- go_generate
- workflow_render
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
env:
WERF_ENV: "SE"
WERF_ENV: "BE"
# <template: build_template>
runs-on: [self-hosted, regular]
outputs:
Expand Down Expand Up @@ -1403,7 +1404,7 @@ jobs:
if [[ -n "${DEV_REGISTRY_PATH}" ]]; then export WERF_REPO="${DEV_REGISTRY_PATH}"; fi
type werf && source $(werf ci-env github --verbose --as-file)
# CE/EE/FE/SE -> ce/ee/fe/se
# CE/EE/FE -> ce/ee/fe
REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]')
# Registry path to publish images for Git branches.
Expand Down Expand Up @@ -1525,7 +1526,7 @@ jobs:
retries: 3
script: |
const statusConfig = 'job,one-line';
const name = 'Build SE';
const name = 'Build BE';
const needsContext = JSON.parse(process.env.NEEDS_CONTEXT);
const jobContext = JSON.parse(process.env.JOB_CONTEXT);
const stepsContext = JSON.parse(process.env.STEPS_CONTEXT);
Expand All @@ -1543,6 +1544,7 @@ jobs:
return await ci.updateCommentOnFinish({github, context, core, statusConfig, name, needsContext, jobContext, stepsContext, jobNames});
# </template: update_comment_on_finish>


build_ce:
name: Build CE
needs:
Expand Down Expand Up @@ -3236,7 +3238,7 @@ jobs:
runs-on: ubuntu-latest
env:
JOB_NAMES: |
{"build_se":"Build SE","build_be":"Build BE","build_ce":"Build CE","build_ee":"Build EE","build_fe":"Build FE","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","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:

# <template: checkout_step>
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/deploy-alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ jobs:
steps:
- run: ": Enable SE"


run_deploy:
name: Deploy ${{needs.git_info.outputs.ci_commit_tag}} to alpha
environment:
Expand Down Expand Up @@ -1026,7 +1027,7 @@ jobs:
# Variables
# 1. Edition and channel.
# CE/EE/FE/SE -> ce/ee/fe/se
# CE/EE/FE -> ce/ee/fe
REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]')
RELEASE_CHANNEL=alpha
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/deploy-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ jobs:
steps:
- run: ": Enable SE"


run_deploy:
name: Deploy ${{needs.git_info.outputs.ci_commit_tag}} to beta
environment:
Expand Down Expand Up @@ -1026,7 +1027,7 @@ jobs:
# Variables
# 1. Edition and channel.
# CE/EE/FE/SE -> ce/ee/fe/se
# CE/EE/FE -> ce/ee/fe
REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]')
RELEASE_CHANNEL=beta
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/deploy-early-access.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ jobs:
steps:
- run: ": Enable SE"


run_deploy:
name: Deploy ${{needs.git_info.outputs.ci_commit_tag}} to early-access
environment:
Expand Down Expand Up @@ -441,6 +442,7 @@ jobs:
docker image push ${SOURCE_RELEASE_VERSION_IMAGE}
- name: Publish release images for CE
if: ${{ needs.detect_editions.outputs.DEPLOY_CE == 'true' }}
env:
Expand Down Expand Up @@ -1025,7 +1027,7 @@ jobs:
# Variables
# 1. Edition and channel.
# CE/EE/FE/SE -> ce/ee/fe/se
# CE/EE/FE -> ce/ee/fe
REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]')
RELEASE_CHANNEL=early-access
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/deploy-rock-solid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ jobs:
steps:
- run: ": Enable SE"


run_deploy:
name: Deploy ${{needs.git_info.outputs.ci_commit_tag}} to rock-solid
environment:
Expand Down Expand Up @@ -441,6 +442,7 @@ jobs:
docker image push ${SOURCE_RELEASE_VERSION_IMAGE}
- name: Publish release images for CE
if: ${{ needs.detect_editions.outputs.DEPLOY_CE == 'true' }}
env:
Expand Down Expand Up @@ -1025,7 +1027,7 @@ jobs:
# Variables
# 1. Edition and channel.
# CE/EE/FE/SE -> ce/ee/fe/se
# CE/EE/FE -> ce/ee/fe
REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]')
RELEASE_CHANNEL=rock-solid
Expand Down Expand Up @@ -1096,6 +1098,7 @@ jobs:
echo "Release version image:"
echo " Source: ${SOURCE_RELEASE_VERSION_IMAGE}"
echo " Prod: ${PROD_RELEASE_VERSION_IMAGE}"
- name: Update release branch
if: ${{ success() }}
continue-on-error: true
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/deploy-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ jobs:
steps:
- run: ": Enable SE"


run_deploy:
name: Deploy ${{needs.git_info.outputs.ci_commit_tag}} to stable
environment:
Expand Down Expand Up @@ -441,6 +442,7 @@ jobs:
docker image push ${SOURCE_RELEASE_VERSION_IMAGE}
- name: Publish release images for CE
if: ${{ needs.detect_editions.outputs.DEPLOY_CE == 'true' }}
env:
Expand Down Expand Up @@ -1025,7 +1027,7 @@ jobs:
# Variables
# 1. Edition and channel.
# CE/EE/FE/SE -> ce/ee/fe/se
# CE/EE/FE -> ce/ee/fe
REGISTRY_SUFFIX=$(echo ${WERF_ENV} | tr '[:upper:]' '[:lower:]')
RELEASE_CHANNEL=stable
Expand Down

0 comments on commit e5dd683

Please sign in to comment.