feat: enhance test data for calculator cli

.github/actions/build-effective-set/action.yml

@@ -18,7 +18,7 @@ inputs:
   dockerfile-path:
     description: 'Path to Dockerfile'
     required: false
-    default: './build_effective_set_generator/Dockerfile'
+    default: './build_effective_set_generator/build/Dockerfile'
   git-user:
     description: 'Git username for build args'
     required: false
@@ -52,6 +52,8 @@ runs:
   steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      with:
+        ref: ${{ inputs.version != '' && format('v{0}', inputs.version) || github.ref }}
 
     - name: Download JAR artifact
       uses: actions/download-artifact@v4

.github/actions/build-envgene/action.yml

@@ -49,6 +49,8 @@ runs:
   steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      with:
+        ref: ${{ inputs.version != '' && format('v{0}', inputs.version) || github.ref }}
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3

.github/actions/build-gsf-discovery/action.yml

@@ -53,8 +53,18 @@ runs:
     - name: Checkout repository
       uses: actions/checkout@v4
       with:
-        token: ${{ inputs.github-token }}
-        fetch-depth: 0
+        ref: ${{ inputs.version != '' && format('v{0}', inputs.version) || github.ref }}
+
+    - name: Update history.log
+      shell: bash
+      run: |
+        COOKIECUTTER_DIR="gsf_packages/envgene_discovery_project/git-system-follower-package/scripts/templates/default/{{ cookiecutter.gsf_repository_name }}"
+        HISTORY_FILE="gsf_packages/envgene_discovery_project/git-system-follower-package/scripts/templates/default/{{ cookiecutter.gsf_repository_name }}/history.log"
+
+        # Run Python script to update history.log
+        python3 ./.github/scripts/update_history.py \
+          "$COOKIECUTTER_DIR" \
+          "$HISTORY_FILE"
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
@@ -73,33 +83,6 @@ runs:
       id: tags
       uses: ./.github/actions/generate-docker-tags
 
-    - name: Update history.log
-      shell: bash
-      run: |
-        COOKIECUTTER_DIR="gsf_packages/envgene_discovery_project/git-system-follower-package/scripts/templates/default/{{ cookiecutter.gsf_repository_name }}"
-        HISTORY_FILE="gsf_packages/envgene_discovery_project/git-system-follower-package/scripts/templates/default/{{ cookiecutter.gsf_repository_name }}/history.log"
-
-        # Run Python script to update history.log
-        python3 ./.github/scripts/update_history.py \
-          "$COOKIECUTTER_DIR" \
-          "$HISTORY_FILE"
-
-    - name: Commit and push changes
-      shell: bash
-      run: |
-        git config --global user.name "github-actions[bot]"
-        git config --global user.email "github-actions[bot]@users.noreply.github.com"
-        git remote set-url origin https://x-access-token:${{ inputs.github-token }}@github.com/${GITHUB_REPOSITORY}.git
-
-        BRANCH_NAME=${GITHUB_REF#refs/heads/}
-        BRANCH_NAME=${BRANCH_NAME#refs/tags/}
-
-        git add -A
-        if ! git diff --quiet --cached; then
-          git commit -m "chore: Update GSF Discovery instance package files [skip ci]"
-          git push origin HEAD:"${BRANCH_NAME}" || echo "Failed to push changes"
-        fi
-
     - name: Extract metadata (tags, labels) for Docker
       id: meta
       uses: docker/metadata-action@v5

.github/actions/build-gsf-instance/action.yml

@@ -53,25 +53,7 @@ runs:
     - name: Checkout repository
       uses: actions/checkout@v4
       with:
-        token: ${{ inputs.github-token }}
-        fetch-depth: 0
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
-    - name: Log in to GitHub Container Registry
-      uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ inputs.github-token }}
-
-    - name: Generate Docker tags
-      id: tags
-      uses: ./.github/actions/generate-docker-tags
+        ref: ${{ inputs.version != '' && format('v{0}', inputs.version) || github.ref }}
 
     - name: Copy config.schema.json to git_hooks
       shell: bash
@@ -91,21 +73,22 @@ runs:
           "$COOKIECUTTER_DIR" \
           "$HISTORY_FILE"
 
-    - name: Commit and push changes
-      shell: bash
-      run: |
-        git config --global user.name "github-actions[bot]"
-        git config --global user.email "github-actions[bot]@users.noreply.github.com"
-        git remote set-url origin https://x-access-token:${{ inputs.github-token }}@github.com/${GITHUB_REPOSITORY}.git
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
 
-        BRANCH_NAME=${GITHUB_REF#refs/heads/}
-        BRANCH_NAME=${BRANCH_NAME#refs/tags/}
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Log in to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ inputs.github-token }}
 
-        git add -A
-        if ! git diff --quiet --cached; then
-          git commit -m "chore: Update GSF EnvGene instance package files [skip ci]"
-          git push origin HEAD:"${BRANCH_NAME}" || echo "Failed to push changes"
-        fi
+    - name: Generate Docker tags
+      id: tags
+      uses: ./.github/actions/generate-docker-tags
 
     - name: Extract metadata (tags, labels) for Docker
       id: meta

.github/actions/build-pipegene/action.yml

@@ -52,6 +52,8 @@ runs:
   steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      with:
+        ref: ${{ inputs.version != '' && format('v{0}', inputs.version) || github.ref }}
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3

.github/actions/build-pipeline/action.yml

@@ -35,6 +35,8 @@ runs:
   steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      with:
+        ref: ${{ inputs.version != '' && format('v{0}', inputs.version) || github.ref }}
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3

.github/actions/run-tests/action.yml

@@ -30,7 +30,7 @@ runs:
             cp dependencies/sources.list /etc/apt/sources.list
         fi
 
-        pip install --upgrade pip setuptools wheel
+        pip install --upgrade pip "setuptools<82" wheel
         pip install --no-cache-dir -r dependencies/tests_requirements.txt
 
         if [ -f python/build_modules.sh ]; then
@@ -44,6 +44,11 @@ runs:
         mv sops-v3.9.0.linux.amd64 /usr/local/bin/sops
         chmod +x /usr/local/bin/sops
 
+    - name: Configure test environment
+      shell: bash
+      run: |
+        echo "PYTHONPATH=${GITHUB_WORKSPACE}" >> "${GITHUB_ENV}"
+
     - name: ENVGENE HELPER test
       shell: bash
       run: |
@@ -52,6 +57,14 @@ runs:
         cd ../../..
         mv junit.xml junit_envgenehelper.xml
 
+    - name: PIPEGENE test
+      shell: bash
+      run: |
+        cd build_pipegene/scripts
+        pytest --capture=no -W ignore::DeprecationWarning --junitxml=../../junit.xml
+        cd ../..
+        mv junit.xml junit_pipegene.xml
+
     - name: ARTIFACT SEARCHER test
       shell: bash
       run: |
@@ -88,10 +101,18 @@ runs:
         cd ../..
         mv junit.xml junit_cred_rotation.xml
 
+    - name: SBOMS RETENTION POLICY test
+      shell: bash
+      run: |
+        cd build_effective_set_generator/scripts
+        pytest --capture=no -W ignore::DeprecationWarning --junitxml=../../junit.xml
+        cd ../..
+        mv junit.xml junit_sbom_retention.xml
+
     - name: Merge test results
       shell: bash
       run: |
-        junitparser merge junit_build_env.xml junit_envgenehelper.xml junit.xml
+        junitparser merge junit_*.xml junit.xml
 
     - name: Upload test results
       if: always()

.github/workflows/docker_publish_release.yml

@@ -86,7 +86,7 @@ jobs:
             fetch-depth: 0
             token: ${{ steps.app-token.outputs.token || secrets.GITHUB_TOKEN }}
 
-        - name: Update Docker Image Tags in Pipeline
+        - name: Add the Envgene version to pipeline and GSF
           run: |
             # Paths to files
             TARGET_FILE="github_workflows/instance-repo-pipeline/.github/workflows/Envgene.yml"
@@ -110,46 +110,18 @@ jobs:
             # Update version in GSF Discovery package.yaml
             sed -i "/version:/c\\version: ${NEW_TAG}" "$GSF_DISCOVERY_PACKAGE_FILE"
 
-            CHANGES_MADE=false
-            if ! git diff --quiet "$TARGET_FILE"; then
-              echo "Updated Envgene.yml with docker tags from job outputs"
-              CHANGES_MADE=true
-            fi
-
-            if ! git diff --quiet "$ENVGENE_COOKIECUTTER_JSON_FILE"; then
-              echo "Updated cookiecutter.json with envgene_version"
-              CHANGES_MADE=true
-            fi
-
-            if ! git diff --quiet "$GSF_INSTANCE_PACKAGE_FILE"; then
-              echo "Updated package.yaml with version"
-              CHANGES_MADE=true
-            fi
-
-            if ! git diff --quiet "$GSF_DISCOVERY_PACKAGE_FILE"; then
-              echo "Updated package.yaml with version"
-              CHANGES_MADE=true
-            fi
-
-            if [ "$CHANGES_MADE" = false ]; then
-              echo "No changes to commit - no images were built or tags were already up to date"
-            fi
+            git diff
 
-            git diff "$TARGET_FILE" || true
-            git diff "$ENVGENE_COOKIECUTTER_JSON_FILE" || true
-            git diff "$GSF_INSTANCE_PACKAGE_FILE" || true
-            git diff "$GSF_DISCOVERY_PACKAGE_FILE" || true
-
-            if [ "$CHANGES_MADE" = true ]; then
-              git config --global user.name "qubership-actions[bot]"
-              git config --global user.email "qubership-actions[bot]@users.noreply.github.com"
-              git add "$TARGET_FILE" "$ENVGENE_COOKIECUTTER_JSON_FILE" "$GSF_INSTANCE_PACKAGE_FILE" "$GSF_DISCOVERY_PACKAGE_FILE"
+            git config --global user.name "qubership-actions[bot]"
+            git config --global user.email "qubership-actions[bot]@users.noreply.github.com"
+            git add .
+            if ! git diff --quiet --cached; then
               git commit -m "chore: Update docker image tags and envgene_version for branch ${{ github.ref_name }} [skip ci]"
-
               git push origin HEAD:${{ github.ref_name }} || echo "Failed to push changes"
             else
-              echo "No changes to commit - skipping git operations"
+              echo "No changes to commit - working tree clean"
             fi
+
   tag:
     needs: [update_image_tags]
     uses: netcracker/qubership-workflow-hub/.github/workflows/tag-creator.yml@v1.0.3
@@ -214,7 +186,7 @@ jobs:
       java-version: 17
       upload-artifact: true
       artifact-id: effective_set_jar
-      ref: ${{ github.ref }}
+      ref: v${{ github.event.inputs.version }}
     secrets:
       maven-token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/link-checker.yaml

@@ -41,10 +41,13 @@
               --max-retries 8
               --accept 100..=103,200..=299,429
               --cookie-jar cookies.json
-              --exclude-all-private
+              --include 'https?://.*'
               --max-concurrency 4
               --cache
               --cache-exclude-status '429, 500..502'
               --max-cache-age 1d
+              --include file
+              --include-fragments
+              --root-dir $GITHUB_WORKSPACE
             format: markdown
             fail: true

.github/workflows/sonar-check.yml

@@ -0,0 +1,28 @@
+name: Sonar Check
+
+on:
+  workflow_dispatch: {}
+  push:
+    branches: [main]
+
+jobs:
+  mvn-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Build java
+        uses: netcracker/qubership-workflow-hub/actions/maven-snapshot-deploy@main
+        with:
+          java-version: 17
+          pom-file: build_effective_set_generator/pom.xml
+          # Default target-store is "central"; the action then adds -Pcentral and GPG runs. Sonar only needs -Pgithub.
+          target-store: github
+          maven-command: >
+            --batch-mode clean verify
+            org.sonarsource.scanner.maven:sonar-maven-plugin:${{ vars.SONAR_PLUGIN_VERSION }}:sonar
+            -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }}
+            -Dsonar.organization=${{ vars.SONAR_ORGANIZATION }}
+            -Dsonar.host.url=${{ vars.SONAR_HOST_URL }}
+          maven-token: ${{ secrets.GITHUB_TOKEN }}
+          sonar-token: ${{ secrets.SONAR_TOKEN }}

.gitignore

@@ -9,3 +9,4 @@ __pycache__
 .vscode
 .DS_Store
 pyrightconfig.json
+junit*

.qubership/grand-report.json

@@ -1,5 +1,8 @@
 {
   "exclusions" : [ {
+    "t-hash" : "00000000",
+    "f-hash" : "519368c1daa626a147f2a8f67e9ceec568378a9b094fd3f6ecd625faa2a1d564"
+  }, {
     "t-hash" : "823c4eb3e895adc925a755d89cea1c6c46954c999d23604e0091788b75496159",
     "f-hash" : "680348e409a5a7a1ccae4a38eea6315f78eab8d683e599d12bf03bc1405b1a75"
   }, {
@@ -8,5 +11,29 @@
   }, {
     "t-hash" : "244f28ce3685167745ad3a7f1760fd4483bbbb3fd150b9087b95442d4d6fd905",
     "f-hash" : "f81b4f0ec55a8c76b2006d0d8fb8cf55ba73f8f24db12cd9e737c06e50f8010c"
+  }, {
+    "t-hash" : "f454bc9163706b52dc68c37847db48967e15b2f18a80c1d85f4387e9970cd299",
+    "f-hash" : "4a097b2592a091a5e9c9898fb01b957287f62d282e37abdc3f64f5397ddf7790"
+  }, {
+    "t-hash" : "f454bc9163706b52dc68c37847db48967e15b2f18a80c1d85f4387e9970cd299",
+    "f-hash" : "1b81a1c8c26e93bbbc06c67a3aeebffaa9fb32e4adc12ea43c546bd8ba6b0db2"
+  }, {
+    "t-hash" : "f454bc9163706b52dc68c37847db48967e15b2f18a80c1d85f4387e9970cd299",
+    "f-hash" : "266ceec1c40da5d4664b1fd8b680fb11ecab4bc58c28ca4b83c95c2cfc87da42"
+  }, {
+    "t-hash" : "f454bc9163706b52dc68c37847db48967e15b2f18a80c1d85f4387e9970cd299",
+    "f-hash" : "12358bb89894a3b900c43b8fbaf976baaecfd1151976ade3a7528cdc47728c52"
+  }, {
+    "t-hash" : "f454bc9163706b52dc68c37847db48967e15b2f18a80c1d85f4387e9970cd299",
+    "f-hash" : "81364271645a7f08f26b6d896bc26221e14ae46b670d66a2990bd3b805c18da3"
+  }, {
+    "t-hash" : "f454bc9163706b52dc68c37847db48967e15b2f18a80c1d85f4387e9970cd299",
+    "f-hash" : "633b0a67c34213aeba550c218df84e75f1839993ec7fef1c8f6c4f9d924f507f"
+  }, {
+    "t-hash" : "f454bc9163706b52dc68c37847db48967e15b2f18a80c1d85f4387e9970cd299",
+    "f-hash" : "490876a57b0af0ebbb422281ec7b178483e8ea4462281533b2a34abbf3725222"
+  }, {
+    "t-hash" : "f454bc9163706b52dc68c37847db48967e15b2f18a80c1d85f4387e9970cd299",
+    "f-hash" : "fe68378b7ff1c467cce4d2579b704fcac1b1cd7bae254f7b5225586ca59233d0"
   } ]
 }