Skip to content

Commit 1e9f576

Browse files
duckhawkAleksZimin
duckhawk
and
AleksZimin
committed
[CI] Add secondary repo in build and SE+ version (#206)
Signed-off-by: v.oleynikov <[email protected]> Signed-off-by: Aleksandr Zimin <[email protected]> Co-authored-by: Aleksandr Zimin <[email protected]> Signed-off-by: Aleksandr Zimin <[email protected]>
1 parent 94d6348 commit 1e9f576

File tree

2 files changed

+123
-11
lines changed

2 files changed

+123
-11
lines changed

‎.github/workflows/build_prod.yml

Lines changed: 100 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- name: SET VAR
2323
run: |
24-
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ce/modules" >> "$GITHUB_ENV"
24+
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ce/modules" >> "$GITHUB_ENV"
2525
- run: |
2626
echo $MODULES_REGISTRY
2727
echo $MODULES_MODULE_NAME
@@ -31,16 +31,30 @@ jobs:
3131
name: Show vars
3232
3333
- uses: actions/checkout@v4
34-
- uses: deckhouse/modules-actions/setup@v1
35-
- uses: deckhouse/modules-actions/build@v1
34+
- uses: deckhouse/modules-actions/[email protected]
35+
with:
36+
registry: ${{ vars.PROD_REGISTRY }}
37+
registry_login: ${{ vars.RENAMED_PROD_MODULES_REGISTRY_LOGIN }}
38+
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
39+
- uses: deckhouse/modules-actions/[email protected]
40+
with:
41+
registry: ${{ vars.DEV_REGISTRY }}
42+
registry_login: ${{ vars.RENAMED_DEV_MODULES_REGISTRY_LOGIN }}
43+
registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
44+
- uses: deckhouse/modules-actions/[email protected]
45+
with:
46+
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/ce/modules"
47+
module_name: ${{ vars.RENAMED_MODULE_NAME }}
48+
module_tag: ${{ github.ref_name }}
49+
secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.RENAMED_MODULE_NAME }}"
3650

3751
prod_ee_setup_build:
3852
runs-on: [self-hosted, regular, selectel]
3953
name: Build and Push EE
4054
steps:
4155
- name: SET VAR
4256
run: |
43-
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ee/modules" >> "$GITHUB_ENV"
57+
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ee/modules" >> "$GITHUB_ENV"
4458
- run: |
4559
echo $MODULES_REGISTRY
4660
echo $MODULES_MODULE_NAME
@@ -50,16 +64,30 @@ jobs:
5064
name: Show vars
5165
5266
- uses: actions/checkout@v4
53-
- uses: deckhouse/modules-actions/setup@v1
54-
- uses: deckhouse/modules-actions/build@v1
67+
- uses: deckhouse/modules-actions/[email protected]
68+
with:
69+
registry: ${{ vars.PROD_REGISTRY }}
70+
registry_login: ${{ vars.RENAMED_PROD_MODULES_REGISTRY_LOGIN }}
71+
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
72+
- uses: deckhouse/modules-actions/[email protected]
73+
with:
74+
registry: ${{ vars.DEV_REGISTRY }}
75+
registry_login: ${{ vars.RENAMED_DEV_MODULES_REGISTRY_LOGIN }}
76+
registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
77+
- uses: deckhouse/modules-actions/[email protected]
78+
with:
79+
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/ee/modules"
80+
module_name: ${{ vars.RENAMED_MODULE_NAME }}
81+
module_tag: ${{ github.ref_name }}
82+
secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.RENAMED_MODULE_NAME }}"
5583

5684
prod_fe_setup_build:
5785
runs-on: [self-hosted, regular, selectel]
5886
name: Build and Push FE
5987
steps:
6088
- name: SET VAR
6189
run: |
62-
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/fe/modules" >> "$GITHUB_ENV"
90+
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/fe/modules" >> "$GITHUB_ENV"
6391
- run: |
6492
echo $MODULES_REGISTRY
6593
echo $MODULES_MODULE_NAME
@@ -69,8 +97,22 @@ jobs:
6997
name: Show vars
7098
7199
- uses: actions/checkout@v4
72-
- uses: deckhouse/modules-actions/setup@v1
73-
- uses: deckhouse/modules-actions/build@v1
100+
- uses: deckhouse/modules-actions/[email protected]
101+
with:
102+
registry: ${{ vars.PROD_REGISTRY }}
103+
registry_login: ${{ vars.RENAMED_PROD_MODULES_REGISTRY_LOGIN }}
104+
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
105+
- uses: deckhouse/modules-actions/[email protected]
106+
with:
107+
registry: ${{ vars.DEV_REGISTRY }}
108+
registry_login: ${{ vars.RENAMED_DEV_MODULES_REGISTRY_LOGIN }}
109+
registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
110+
- uses: deckhouse/modules-actions/[email protected]
111+
with:
112+
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/fe/modules"
113+
module_name: ${{ vars.RENAMED_MODULE_NAME }}
114+
module_tag: ${{ github.ref_name }}
115+
secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.RENAMED_MODULE_NAME }}"
74116

75117
prod_se_setup_build:
76118
runs-on: [self-hosted, regular, selectel]
@@ -88,5 +130,52 @@ jobs:
88130
name: Show vars
89131
90132
- uses: actions/checkout@v4
91-
- uses: deckhouse/modules-actions/setup@v1
92-
- uses: deckhouse/modules-actions/build@v1
133+
- uses: deckhouse/modules-actions/[email protected]
134+
with:
135+
registry: ${{ vars.PROD_REGISTRY }}
136+
registry_login: ${{ vars.RENAMED_PROD_MODULES_REGISTRY_LOGIN }}
137+
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
138+
- uses: deckhouse/modules-actions/[email protected]
139+
with:
140+
registry: ${{ vars.DEV_REGISTRY }}
141+
registry_login: ${{ vars.RENAMED_DEV_MODULES_REGISTRY_LOGIN }}
142+
registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
143+
- uses: deckhouse/modules-actions/[email protected]
144+
with:
145+
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/se/modules"
146+
module_name: ${{ vars.RENAMED_MODULE_NAME }}
147+
module_tag: ${{ github.ref_name }}
148+
secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.RENAMED_MODULE_NAME }}"
149+
150+
prod_se_plus_setup_build:
151+
runs-on: [self-hosted, regular, selectel]
152+
name: Build and Push SE+
153+
steps:
154+
- name: SET VAR
155+
run: |
156+
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se-plus/modules" >> "$GITHUB_ENV"
157+
- run: |
158+
echo $MODULES_REGISTRY
159+
echo $MODULES_MODULE_NAME
160+
echo $MODULES_MODULE_SOURCE
161+
echo $MODULES_MODULE_TAG
162+
shell: bash
163+
name: Show vars
164+
165+
- uses: actions/checkout@v4
166+
- uses: deckhouse/modules-actions/[email protected]
167+
with:
168+
registry: ${{ vars.PROD_REGISTRY }}
169+
registry_login: ${{ vars.RENAMED_PROD_MODULES_REGISTRY_LOGIN }}
170+
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
171+
- uses: deckhouse/modules-actions/[email protected]
172+
with:
173+
registry: ${{ vars.DEV_REGISTRY }}
174+
registry_login: ${{ vars.RENAMED_DEV_MODULES_REGISTRY_LOGIN }}
175+
registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
176+
- uses: deckhouse/modules-actions/[email protected]
177+
with:
178+
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/se-plus/modules"
179+
module_name: ${{ vars.RENAMED_MODULE_NAME }}
180+
module_tag: ${{ github.ref_name }}
181+
secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.RENAMED_MODULE_NAME }}"

‎.github/workflows/deploy_prod.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ on:
3737
se:
3838
type: boolean
3939
description: SE
40+
se-plus:
41+
type: boolean
42+
description: SE+
4043

4144
tag:
4245
description: "Tag of the module, example v1.21.1"
@@ -137,3 +140,23 @@ jobs:
137140
chmod +x .github/check_previous_channel_release.sh
138141
.github/check_previous_channel_release.sh $MODULES_MODULE_NAME se $RELEASE_CHANNEL $MODULES_MODULE_TAG license-token $MODULES_READ_REGISTRY_PASSWORD
139142
- uses: deckhouse/modules-actions/deploy@v1
143+
144+
job-SE-plus:
145+
name: Edition SE+
146+
runs-on: [self-hosted, regular, selectel]
147+
if: github.event.inputs.se-plus == 'true'
148+
steps:
149+
- run: echo "SE+"
150+
- name: SET VAR
151+
run: |
152+
echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se-plus/modules" >> "$GITHUB_ENV"
153+
- name: ECHO VAR
154+
run: |
155+
echo $MODULES_MODULE_SOURCE
156+
- uses: actions/checkout@v4
157+
- uses: deckhouse/modules-actions/setup@v1
158+
- name: Check previous release
159+
run: |
160+
chmod +x .github/check_previous_channel_release.sh
161+
.github/check_previous_channel_release.sh $MODULES_MODULE_NAME se-plus $RELEASE_CHANNEL $MODULES_MODULE_TAG license-token $MODULES_READ_REGISTRY_PASSWORD
162+
- uses: deckhouse/modules-actions/deploy@v1

0 commit comments

Comments
 (0)