ci with support of editions

Signed-off-by: Aleksandr Stefurishin <aleksandr.stefurishin@flant.com>
deckhouse · Feb 15, 2025 · 52bf4b3 · 52bf4b3
1 parent 08b8729
commit 52bf4b3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 25 deletions.
diff --git a/.github/workflows/build_dev.yml b/.github/workflows/build_dev.yml
@@ -6,6 +6,7 @@ env:
   MODULES_MODULE_NAME: ${{ vars.MODULE_NAME }}
   MODULES_MODULE_SOURCE: ${{ vars.DEV_MODULE_SOURCE }}
   MODULES_REGISTRY_LOGIN: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }}
+  DEFAULT_EDITION: ${{ vars.DEFAULT_EDITION }}
   MODULES_REGISTRY_PASSWORD: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
 
 on:
@@ -50,13 +51,10 @@ jobs:
       - name: Set vars
         id: set-vars
         run: |
-          # Slect edition for build, default EE
-          if echo "${{ steps.get-labels.outputs.result }}" | grep -q "edition/ce"; then
-            echo "MODULE_EDITION=CE" >> "$GITHUB_OUTPUT"
-          else
-            echo "MODULE_EDITION=EE" >> "$GITHUB_OUTPUT"
-          fi
-
+          MODULE_EDITION=$DEFAULT_EDITION
+          EDITION=$(echo "${{ steps.get-labels.outputs.result }}" | grep -Po "edition/\K\w+" | head -n 1 || true)
+          [[ -n $EDITION ]] && MODULE_EDITION=$EDITION
+          echo "MODULE_EDITION=$MODULE_EDITION" >> "$GITHUB_OUTPUT"
   dev_setup_build:
     runs-on: [self-hosted, regular, selectel]
     name: Build and Push images

diff --git a/.github/workflows/build_prod.yml b/.github/workflows/build_prod.yml
@@ -14,6 +14,10 @@ on:
     tags:
       - '**'
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   prod_ce_setup_build:
     runs-on: [self-hosted, regular, selectel]
@@ -22,14 +26,13 @@ jobs:
       - name: SET VAR
         run: |
           echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ce/modules" >> "$GITHUB_ENV"
-          echo "MODULE_EDITION=CE" >> "$GITHUB_ENV"
+          echo "MODULE_EDITION=ce" >> "$GITHUB_ENV"
       - run: |
           echo $MODULES_REGISTRY
           echo $MODULES_MODULE_NAME
           echo $MODULES_MODULE_SOURCE
           echo $MODULES_MODULE_TAG
           echo $MODULE_EDITION
-        shell: bash
         name: Show vars
 
       - uses: actions/checkout@v4
@@ -57,14 +60,13 @@ jobs:
       - name: SET VAR
         run: |
           echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/ee/modules" >> "$GITHUB_ENV"
-          echo "MODULE_EDITION=EE" >> "$GITHUB_ENV"
+          echo "MODULE_EDITION=ee" >> "$GITHUB_ENV"
       - run: |
           echo $MODULES_REGISTRY
           echo $MODULES_MODULE_NAME
           echo $MODULES_MODULE_SOURCE
           echo $MODULES_MODULE_TAG
           echo $MODULE_EDITION
-        shell: bash
         name: Show vars
 
       - uses: actions/checkout@v4
@@ -92,14 +94,13 @@ jobs:
       - name: SET VAR
         run: |
           echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/fe/modules" >> "$GITHUB_ENV"
-          echo "MODULE_EDITION=EE" >> "$GITHUB_ENV"
+          echo "MODULE_EDITION=ee" >> "$GITHUB_ENV"
       - run: |
           echo $MODULES_REGISTRY
           echo $MODULES_MODULE_NAME
           echo $MODULES_MODULE_SOURCE
           echo $MODULES_MODULE_TAG
           echo $MODULE_EDITION
-        shell: bash
         name: Show vars
 
       - uses: actions/checkout@v4
@@ -127,14 +128,13 @@ jobs:
       - name: SET VAR
         run: |
           echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se/modules" >> "$GITHUB_ENV"
-          echo "MODULE_EDITION=EE" >> "$GITHUB_ENV"
+          echo "MODULE_EDITION=se" >> "$GITHUB_ENV"
       - run: |
           echo $MODULES_REGISTRY
           echo $MODULES_MODULE_NAME
           echo $MODULES_MODULE_SOURCE
           echo $MODULES_MODULE_TAG
           echo $MODULE_EDITION
-        shell: bash
         name: Show vars
 
       - uses: actions/checkout@v4
@@ -162,14 +162,13 @@ jobs:
       - name: SET VAR
         run: |
           echo "MODULES_MODULE_SOURCE=$MODULES_REGISTRY/$MODULE_SOURCE_NAME/se-plus/modules" >> "$GITHUB_ENV"
-          echo "MODULE_EDITION=EE" >> "$GITHUB_ENV"
+          echo "MODULE_EDITION=seplus" >> "$GITHUB_ENV"
       - run: |
           echo $MODULES_REGISTRY
           echo $MODULES_MODULE_NAME
           echo $MODULES_MODULE_SOURCE
           echo $MODULES_MODULE_TAG
           echo $MODULE_EDITION
-        shell: bash
         name: Show vars
 
       - uses: actions/checkout@v4

diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml
@@ -5,7 +5,7 @@ env:
   MODULE_SOURCE_NAME: ${{ vars.PROD_MODULE_SOURCE_NAME }}
   CI_COMMIT_REF_NAME: ${{ github.ref_name }}
   MODULES_MODULE_NAME: ${{ vars.MODULE_NAME }}
-  RELEASE_CHANNEL: ${{ github.event.inputs.version }}
+  RELEASE_CHANNEL: ${{ github.event.inputs.channel }}
   MODULES_REGISTRY_LOGIN: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }}
   MODULES_REGISTRY_PASSWORD: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
   MODULES_READ_REGISTRY_PASSWORD: ${{ secrets.PROD_MODULES_READ_REGISTRY_PASSWORD }}
@@ -14,8 +14,8 @@ env:
 on:
   workflow_dispatch:
     inputs:
-      version:
-        description: "Select version"
+      channel:
+        description: "Select release channel"
         type: choice
         default: alpha
         options:

diff --git a/.github/workflows/go_lint.yaml b/.github/workflows/go_lint.yaml
@@ -1,7 +1,7 @@
 name: Go linter for images
 
 env:
-  GO_BUILD_TAGS: "CE EE"
+  GO_BUILD_TAGS: "ce se seplus ee csepro"
 
 on:
   pull_request:
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.4'
+          go-version: '1.23.5'
 
       - name: Install golangci-lint
         run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0

diff --git a/.github/workflows/go_modules_check.yaml b/.github/workflows/go_modules_check.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.4'
+          go-version: '1.23.5'
 
       - name: Run Go modules version check
         run: |

diff --git a/.github/workflows/go_tests.yaml b/.github/workflows/go_tests.yaml
@@ -1,7 +1,7 @@
 name: Go tests for images
 
 env:
-  GO_BUILD_TAGS: "CE EE"
+  GO_BUILD_TAGS: "ce se seplus ee csepro"
 
 on:
   pull_request:
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.4'
+          go-version: '1.23.5'
 
       - name: Run Go tests
         run: |