Feature/371 pi13 transfer to tractus x

.github/workflows/integration-test-DIL.yaml → .github/workflows/cucumber-integration-test-DIL.yaml

@@ -10,12 +10,10 @@ concurrency:
 
 jobs:
   trigger-integration-test:
-    uses: ./.github/workflows/xray-cucumber-integration.yaml
+    uses: ./.github/workflows/cucumber-integration-test.yaml
     secrets:
       regularUserApiKey: ${{ secrets.DIL_REGULAR_USER_API_KEY }}
       adminUserApiKey: ${{ secrets.DIL_ADMIN_USER_API_KEY }}
-      jiraUser: ${{ secrets.ORG_IRS_JIRA_USERNAME }}
-      jiraPassword: ${{ secrets.ORG_IRS_JIRA_PASSWORD }}
+      cucumberPublishToken: ${{ secrets.IRS_CUCUMBER_PUBLISH_TOKEN }}
     with:
-      executionFilter: "not @Ignore and @INTEGRATION_TEST and @DIL"
-      exportFilter: "11349"
+      executionFilter: "!Ignore & !INACTIVE & INTEGRATION_TEST & DIL"

.github/workflows/cucumber-integration-test-INT.yaml

@@ -0,0 +1,20 @@
+name: IRS INT Cucumber Integration test execution
+
+on:
+  workflow_dispatch: # Trigger manually
+
+# Cancel previous Test executions if a new one is triggered.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  trigger-integration-test:
+    uses: ./.github/workflows/cucumber-integration-test.yaml
+    secrets:
+      regularUserApiKey: ${{ secrets.INT_REGULAR_USER_API_KEY }}
+      adminUserApiKey: ${{ secrets.INT_ADMIN_USER_API_KEY }}
+      cucumberPublishToken: ${{ secrets.IRS_CUCUMBER_PUBLISH_TOKEN }}
+    with:
+      executionFilter: "!Ignore & !INACTIVE & INTEGRATION_TEST & INT"
+

.github/workflows/cucumber-integration-test.yaml

@@ -0,0 +1,82 @@
+name: IRS Cucumber Integration Test execution
+
+on:
+  workflow_call: # Trigger by another workflow
+    secrets:
+      regularUserApiKey:
+        required: true
+      adminUserApiKey:
+        required: true
+      cucumberPublishToken:
+        required: true
+    inputs:
+      executionFilter:
+        required: true
+        type: string
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Cache maven packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Run Tests with Maven
+        env:
+          REGULAR_USER_API_KEY: ${{ secrets.regularUserApiKey }}
+          ADMIN_USER_API_KEY: ${{ secrets.adminUserApiKey }}
+          ISSUE_FILTER: ${{ inputs.executionFilter }}
+          CUCUMBER_PUBLISH_TOKEN: ${{ secrets.cucumberPublishToken }}
+        run: mvn clean verify -P cucumber -Dgroups="$ISSUE_FILTER" -pl irs-cucumber-tests -am --batch-mode 2> irs-cucumber-tests/report-banner.txt
+
+      - name: Publish Cucumber Results
+        uses: EnricoMi/[email protected]
+        if: always()
+        with:
+          files: |
+            irs-cucumber-tests/target/cucumber-junit-report.xml
+
+      - name: Get Cucumber Report
+        if: always()
+        id: get-cucumber-report
+        run: |
+          grep -E "^│.*│$" irs-cucumber-tests/report-banner.txt > irs-cucumber-tests/cucumber-report.txt
+          sed -i 's/│//g' irs-cucumber-tests/cucumber-report.txt
+          cat irs-cucumber-tests/cucumber-report.txt
+
+      - name: Find previous comment in PR
+        if: always() && github.event_name == 'pull_request'
+        uses: peter-evans/find-comment@v3
+        id: find-comment
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: 'View your Cucumber Report at'
+
+      - name: Create or update comment in PR
+        if: always() && github.event_name == 'pull_request'
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: ${{ steps.find-comment.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body-path: 'irs-cucumber-tests/cucumber-report.txt'
+          edit-mode: replace
+
+      - name: Upload Report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          path: 'irs-cucumber-tests/target/report.html'

.github/workflows/eclipse-dash.yml

@@ -3,12 +3,14 @@ name: "Eclipse DASH IP Check"
 on:
   workflow_dispatch: # Trigger manually
   push:
-    branches: main
+    branches:
+      - main
     paths-ignore:
       - '**/*.md'
       - '**/*.txt'
   pull_request:
-    branches: main
+    branches:
+      - main
     paths:
       - '**/pom.xml'
       - 'pom.xml'
@@ -34,13 +36,13 @@ jobs:
 
       - name: Build with Maven and check dependencies with dash
         run: |
-          mvn --batch-mode --update-snapshots verify -Ddash.fail=true -DskipTests
+          mvn --batch-mode --update-snapshots verify -P dash
 
       - name: Ensure DEPENDENCIES file is reflecting the current state
         run: |
-          mvn org.eclipse.dash:license-tool-plugin:license-check -Ddash.summary=DEPENDENCIES-gen
+          mvn org.eclipse.dash:license-tool-plugin:license-check -Ddash.summary=DEPENDENCIES-gen -P dash
           diff DEPENDENCIES DEPENDENCIES-gen
-          
+
 
       - name: upload results
         if: always()

.github/workflows/integration-test-DEV.yaml

@@ -21,12 +21,10 @@ concurrency:
 
 jobs:
   trigger-integration-test:
-    uses: ./.github/workflows/xray-cucumber-integration.yaml
+    uses: ./.github/workflows/cucumber-integration-test.yaml
     secrets:
       regularUserApiKey: ${{ secrets.DEV_REGULAR_USER_API_KEY }}
       adminUserApiKey: ${{ secrets.DEV_ADMIN_USER_API_KEY }}
-      jiraUser: ${{ secrets.ORG_IRS_JIRA_USERNAME }}
-      jiraPassword: ${{ secrets.ORG_IRS_JIRA_PASSWORD }}
+      cucumberPublishToken: ${{ secrets.IRS_CUCUMBER_PUBLISH_TOKEN }}
     with:
-      executionFilter: "not @Ignore and @INTEGRATION_TEST and @DEV"
-      exportFilter: "11349"
+      executionFilter: "!Ignore & !INACTIVE & INTEGRATION_TEST & DEV"

.github/workflows/tavern-integration.yml

@@ -33,11 +33,6 @@ on:
         description: BPN to use for the asBuilt global-asset-id.
         default: 'BPNL00000003AYRE'
         required: true
-      execution-ticket:
-        type: string
-        description: JIRA execution ticket to safe results in.
-        default: 'TRI-1531'
-        required: true
 
 jobs:
   test:
@@ -70,16 +65,14 @@ jobs:
         run: |
           python -m pytest local/testing/api-tests/irs-api-tests.tavern.yaml --junitxml=tavern-results.xml
 
-      - name: Upload results
+      - name: Mask credentials
         if: always()
-        env:
-          JIRA_USERNAME: ${{ secrets.ORG_IRS_JIRA_USERNAME }}
-          JIRA_PASSWORD: ${{ secrets.ORG_IRS_JIRA_PASSWORD }}
-          TEST_EXECUTION_TICKET: ${{ github.event.inputs.execution-ticket || 'TRI-1531' }}
-        # Remove tokens and upload the tavern results to JIRA Test execution
         run: |
           sed "s/access_tok.*:s = '.*'//g" tavern-results.xml | sed "s/Authorization: Bearer .*/Authorization:/g" | uniq > result.xml
-          curl -H "Content-Type: multipart/form-data" \
-          -u $JIRA_USERNAME:$JIRA_PASSWORD \
-          -F '[email protected]' \
-          "https://jira.catena-x.net/rest/raven/1.0/import/execution/junit?testExecKey=$TEST_EXECUTION_TICKET"
+
+      - name: Publish Tavern Results
+        uses: EnricoMi/[email protected]
+        if: always()
+        with:
+          files: |
+            result.xml

.github/workflows/tavern.yml

@@ -48,11 +48,7 @@ on:
         description: Incident BPN to search for which violates against environmental and social standards.
         default: 'BPNS00000003B6LU'
         required: true
-      execution-ticket:
-        type: string
-        description: JIRA execution ticket to safe results in.
-        default: 'TRI-910'
-        required: true
+
   schedule:
     - cron: '0 1 * * 1-5' # At 01:00 on every day-of-week from Monday through Friday.
 
@@ -92,16 +88,14 @@ jobs:
         run: |
           python -m pytest local/testing/api-tests/irs-api-tests.tavern.yaml --junitxml=tavern-results.xml
 
-      - name: Upload results
+      - name: Mask credentials
         if: always()
-        env:
-          JIRA_USERNAME: ${{ secrets.ORG_IRS_JIRA_USERNAME }}
-          JIRA_PASSWORD: ${{ secrets.ORG_IRS_JIRA_PASSWORD }}
-          TEST_EXECUTION_TICKET: ${{ github.event.inputs.execution-ticket || 'TRI-910' }}
-        # Remove tokens and upload the tavern results to JIRA Test execution
         run: |
           sed "s/access_tok.*:s = '.*'//g" tavern-results.xml | sed "s/Authorization: Bearer .*/Authorization:/g" | uniq > result.xml
-          curl -H "Content-Type: multipart/form-data" \
-          -u $JIRA_USERNAME:$JIRA_PASSWORD \
-          -F '[email protected]' \
-          "https://jira.catena-x.net/rest/raven/1.0/import/execution/junit?testExecKey=$TEST_EXECUTION_TICKET"
+
+      - name: Publish Tavern Results
+        uses: EnricoMi/[email protected]
+        if: always()
+        with:
+          files: |
+            result.xml