From 9f6526b5c8440101e822719cecbdef79703ef20d Mon Sep 17 00:00:00 2001 From: "v.oleynikov" Date: Tue, 17 Dec 2024 15:42:21 +0300 Subject: [PATCH 1/3] [CI] Add secondary repo in build Signed-off-by: v.oleynikov --- .github/workflows/build_prod.yml | 111 +++++++++++++++++++++++++++--- .github/workflows/deploy_prod.yml | 23 +++++++ 2 files changed, 123 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_prod.yml b/.github/workflows/build_prod.yml index 90a8e6ae..40763b9a 100644 --- a/.github/workflows/build_prod.yml +++ b/.github/workflows/build_prod.yml @@ -21,7 +21,7 @@ jobs: steps: - name: SET VAR run: | - echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ce/modules" >> "$GITHUB_ENV" + echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ce/modules" >> "$GITHUB_ENV" - run: | echo $MODULES_REGISTRY echo $MODULES_MODULE_NAME @@ -31,8 +31,22 @@ jobs: name: Show vars - uses: actions/checkout@v4 - - uses: deckhouse/modules-actions/setup@v1 - - uses: deckhouse/modules-actions/build@v1 + - uses: deckhouse/modules-actions/setup@storage + with: + registry: ${{ vars.PROD_REGISTRY }} + registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }} + registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }} + - uses: deckhouse/modules-actions/setup@storage + with: + registry: ${{ vars.DEV_REGISTRY }} + registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }} + registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }} + - uses: deckhouse/modules-actions/build@storage + with: + module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/ce/modules" + module_name: ${{ vars.MODULE_NAME }} + module_tag: ${{ github.ref_name }} + secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}" prod_ee_setup_build: runs-on: [self-hosted, regular, selectel] @@ -40,7 +54,7 @@ jobs: steps: - name: SET VAR run: | - echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ee/modules" >> "$GITHUB_ENV" + echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ee/modules" >> "$GITHUB_ENV" - run: | echo $MODULES_REGISTRY echo $MODULES_MODULE_NAME @@ -50,8 +64,22 @@ jobs: name: Show vars - uses: actions/checkout@v4 - - uses: deckhouse/modules-actions/setup@v1 - - uses: deckhouse/modules-actions/build@v1 + - uses: deckhouse/modules-actions/setup@storage + with: + registry: ${{ vars.PROD_REGISTRY }} + registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }} + registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }} + - uses: deckhouse/modules-actions/setup@storage + with: + registry: ${{ vars.DEV_REGISTRY }} + registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }} + registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }} + - uses: deckhouse/modules-actions/build@storage + with: + module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/ee/modules" + module_name: ${{ vars.MODULE_NAME }} + module_tag: ${{ github.ref_name }} + secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}" prod_fe_setup_build: runs-on: [self-hosted, regular, selectel] @@ -59,7 +87,7 @@ jobs: steps: - name: SET VAR run: | - echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/fe/modules" >> "$GITHUB_ENV" + echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/fe/modules" >> "$GITHUB_ENV" - run: | echo $MODULES_REGISTRY echo $MODULES_MODULE_NAME @@ -69,8 +97,22 @@ jobs: name: Show vars - uses: actions/checkout@v4 - - uses: deckhouse/modules-actions/setup@v1 - - uses: deckhouse/modules-actions/build@v1 + - uses: deckhouse/modules-actions/setup@storage + with: + registry: ${{ vars.PROD_REGISTRY }} + registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }} + registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }} + - uses: deckhouse/modules-actions/setup@storage + with: + registry: ${{ vars.DEV_REGISTRY }} + registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }} + registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }} + - uses: deckhouse/modules-actions/build@storage + with: + module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/fe/modules" + module_name: ${{ vars.MODULE_NAME }} + module_tag: ${{ github.ref_name }} + secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}" prod_se_setup_build: runs-on: [self-hosted, regular, selectel] @@ -88,5 +130,52 @@ jobs: name: Show vars - uses: actions/checkout@v4 - - uses: deckhouse/modules-actions/setup@v1 - - uses: deckhouse/modules-actions/build@v1 + - uses: deckhouse/modules-actions/setup@storage + with: + registry: ${{ vars.PROD_REGISTRY }} + registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }} + registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }} + - uses: deckhouse/modules-actions/setup@storage + with: + registry: ${{ vars.DEV_REGISTRY }} + registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }} + registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }} + - uses: deckhouse/modules-actions/build@storage + with: + module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/se/modules" + module_name: ${{ vars.MODULE_NAME }} + module_tag: ${{ github.ref_name }} + secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}" + + prod_se_plus_setup_build: + runs-on: [self-hosted, regular, selectel] + name: Build and Push SE+ + steps: + - name: SET VAR + run: | + echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se-plus/modules" >> "$GITHUB_ENV" + - run: | + echo $MODULES_REGISTRY + echo $MODULES_MODULE_NAME + echo $MODULES_MODULE_SOURCE + echo $MODULES_MODULE_TAG + shell: bash + name: Show vars + + - uses: actions/checkout@v4 + - uses: deckhouse/modules-actions/setup@storage + with: + registry: ${{ vars.PROD_REGISTRY }} + registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }} + registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }} + - uses: deckhouse/modules-actions/setup@storage + with: + registry: ${{ vars.DEV_REGISTRY }} + registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }} + registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }} + - uses: deckhouse/modules-actions/build@storage + with: + module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/se-plus/modules" + module_name: ${{ vars.MODULE_NAME }} + module_tag: ${{ github.ref_name }} + secondary_repo: "${{ vars.DEV_MODULE_SOURCE }}/${{ vars.MODULE_NAME }}" diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml index 17f93d0c..692859f7 100644 --- a/.github/workflows/deploy_prod.yml +++ b/.github/workflows/deploy_prod.yml @@ -37,6 +37,9 @@ on: se: type: boolean description: SE + se-plus: + type: boolean + description: SE tag: description: "Tag of the module, example v1.21.1" @@ -137,3 +140,23 @@ jobs: chmod +x .github/check_previous_channel_release.sh .github/check_previous_channel_release.sh $MODULES_MODULE_NAME se $RELEASE_CHANNEL $MODULES_MODULE_TAG license-token $MODULES_READ_REGISTRY_PASSWORD - uses: deckhouse/modules-actions/deploy@v1 + + job-SE-plus: + name: Edition SE+ + runs-on: [self-hosted, regular, selectel] + if: github.event.inputs.se-plus == 'true' + steps: + - run: echo "SE+" + - name: SET VAR + run: | + echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se-plus/modules" >> "$GITHUB_ENV" + - name: ECHO VAR + run: | + echo $MODULES_MODULE_SOURCE + - uses: actions/checkout@v4 + - uses: deckhouse/modules-actions/setup@v1 + - name: Check previous release + run: | + chmod +x .github/check_previous_channel_release.sh + .github/check_previous_channel_release.sh $MODULES_MODULE_NAME se-plus $RELEASE_CHANNEL $MODULES_MODULE_TAG license-token $MODULES_READ_REGISTRY_PASSWORD + - uses: deckhouse/modules-actions/deploy@v1 From 2b5b8939a38ca095b920f652bf4c857840b46b11 Mon Sep 17 00:00:00 2001 From: "v.oleynikov" Date: Wed, 18 Dec 2024 10:13:34 +0300 Subject: [PATCH 2/3] Fix Signed-off-by: v.oleynikov --- .github/workflows/build_prod.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_prod.yml b/.github/workflows/build_prod.yml index 40763b9a..f6f9ec7e 100644 --- a/.github/workflows/build_prod.yml +++ b/.github/workflows/build_prod.yml @@ -31,17 +31,17 @@ jobs: name: Show vars - uses: actions/checkout@v4 - - uses: deckhouse/modules-actions/setup@storage + - uses: deckhouse/modules-actions/setup@v1.2 with: registry: ${{ vars.PROD_REGISTRY }} registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }} registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }} - - uses: deckhouse/modules-actions/setup@storage + - uses: deckhouse/modules-actions/setup@v1.2 with: registry: ${{ vars.DEV_REGISTRY }} registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }} registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }} - - uses: deckhouse/modules-actions/build@storage + - uses: deckhouse/modules-actions/build@v1.2 with: module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/ce/modules" module_name: ${{ vars.MODULE_NAME }} @@ -64,17 +64,17 @@ jobs: name: Show vars - uses: actions/checkout@v4 - - uses: deckhouse/modules-actions/setup@storage + - uses: deckhouse/modules-actions/setup@v1.2 with: registry: ${{ vars.PROD_REGISTRY }} registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }} registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }} - - uses: deckhouse/modules-actions/setup@storage + - uses: deckhouse/modules-actions/setup@v1.2 with: registry: ${{ vars.DEV_REGISTRY }} registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }} registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }} - - uses: deckhouse/modules-actions/build@storage + - uses: deckhouse/modules-actions/build@v1.2 with: module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/ee/modules" module_name: ${{ vars.MODULE_NAME }} @@ -97,17 +97,17 @@ jobs: name: Show vars - uses: actions/checkout@v4 - - uses: deckhouse/modules-actions/setup@storage + - uses: deckhouse/modules-actions/setup@v1.2 with: registry: ${{ vars.PROD_REGISTRY }} registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }} registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }} - - uses: deckhouse/modules-actions/setup@storage + - uses: deckhouse/modules-actions/setup@v1.2 with: registry: ${{ vars.DEV_REGISTRY }} registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }} registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }} - - uses: deckhouse/modules-actions/build@storage + - uses: deckhouse/modules-actions/build@v1.2 with: module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/fe/modules" module_name: ${{ vars.MODULE_NAME }} @@ -130,17 +130,17 @@ jobs: name: Show vars - uses: actions/checkout@v4 - - uses: deckhouse/modules-actions/setup@storage + - uses: deckhouse/modules-actions/setup@v1.2 with: registry: ${{ vars.PROD_REGISTRY }} registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }} registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }} - - uses: deckhouse/modules-actions/setup@storage + - uses: deckhouse/modules-actions/setup@v1.2 with: registry: ${{ vars.DEV_REGISTRY }} registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }} registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }} - - uses: deckhouse/modules-actions/build@storage + - uses: deckhouse/modules-actions/build@v1.2 with: module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/se/modules" module_name: ${{ vars.MODULE_NAME }} @@ -163,17 +163,17 @@ jobs: name: Show vars - uses: actions/checkout@v4 - - uses: deckhouse/modules-actions/setup@storage + - uses: deckhouse/modules-actions/setup@v1.2 with: registry: ${{ vars.PROD_REGISTRY }} registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }} registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }} - - uses: deckhouse/modules-actions/setup@storage + - uses: deckhouse/modules-actions/setup@v1.2 with: registry: ${{ vars.DEV_REGISTRY }} registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }} registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }} - - uses: deckhouse/modules-actions/build@storage + - uses: deckhouse/modules-actions/build@v1.2 with: module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/se-plus/modules" module_name: ${{ vars.MODULE_NAME }} From fd64b061efb95547af2b69b11747531b463e1a2d Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Wed, 18 Dec 2024 18:02:50 +0300 Subject: [PATCH 3/3] Update .github/workflows/deploy_prod.yml Signed-off-by: Aleksandr Zimin --- .github/workflows/deploy_prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml index 692859f7..8318c2db 100644 --- a/.github/workflows/deploy_prod.yml +++ b/.github/workflows/deploy_prod.yml @@ -39,7 +39,7 @@ on: description: SE se-plus: type: boolean - description: SE + description: SE+ tag: description: "Tag of the module, example v1.21.1"