diff --git a/.github/actions/e2e-composite/action.yml b/.github/actions/e2e-composite/action.yml new file mode 100644 index 000000000..bb67bb134 --- /dev/null +++ b/.github/actions/e2e-composite/action.yml @@ -0,0 +1,21 @@ +name: 'End-to-end testing composite' +description: 'Run MDM-Core End-to-end functional tests' +inputs: + package: + description: 'The package to be tested' + required: true +runs: + using: 'composite' + steps: + - name: 'E2E Functional Test: ${{ inputs.package }}' + run: ./gradlew -Dgradle.test.package=${{ inputs.package }} :mdm-testing-functional:integrationTest + + - name: 'E2E Functional Test Report: ${{ inputs.package }}' + uses: dorny/test-reporter@v1 + if: success() || failure() + with: + name: 'E2E Functional Test Results: ${{ inputs.package }}' + path: mdm-testing-functional/build/test-results/${{ inputs.package }}/*.xml + reporter: java-junit + list-suites: 'failed' + list-tests: 'failed' diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4e6be9cdc..897ca8485 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -17,6 +17,7 @@ permissions: contents: read actions: read checks: write + security-events: write jobs: build: @@ -137,6 +138,50 @@ jobs: reporter: java-junit list-tests: 'failed' + - uses: ./.github/actions/e2e-composite + with: + package: core + + - uses: ./.github/actions/e2e-composite + with: + package: security + + - uses: ./.github/actions/e2e-composite + with: + package: authentication + + - uses: ./.github/actions/e2e-composite + with: + package: datamodel + + - uses: ./.github/actions/e2e-composite + with: + package: terminology + + - uses: ./.github/actions/e2e-composite + with: + package: referencedata + + - uses: ./.github/actions/e2e-composite + with: + package: profile + + - uses: ./.github/actions/e2e-composite + with: + package: dataflow + + - uses: ./.github/actions/e2e-composite + with: + package: federation + + - uses: ./.github/actions/e2e-composite + with: + package: facet + + - uses: ./.github/actions/e2e-composite + with: + package: versionedfolder + # - name: Archive test report # if: always() # uses: actions/upload-artifact@v3 @@ -150,7 +195,6 @@ jobs: # All available variables are described in documentation # https://megalinter.io/configuration/ VALIDATE_ALL_CODEBASE: true - ENABLE_LINTERS: GROOVY_NPM_GROOVY_LINT LINTER_RULES_PATH: 'config/codenarc' DISABLE_ERRORS: true #Flag to have the linter complete with exit code 0 even if errors were detected. diff --git a/mdm-testing-functional/src/integration-test/groovy/uk/ac/ox/softeng/maurodatamapper/testing/functional/core/admin/AdminFunctionalSpec.groovy b/mdm-testing-functional/src/integration-test/groovy/uk/ac/ox/softeng/maurodatamapper/testing/functional/core/admin/AdminFunctionalSpec.groovy index f5e3d3b7b..c05d2bfa1 100644 --- a/mdm-testing-functional/src/integration-test/groovy/uk/ac/ox/softeng/maurodatamapper/testing/functional/core/admin/AdminFunctionalSpec.groovy +++ b/mdm-testing-functional/src/integration-test/groovy/uk/ac/ox/softeng/maurodatamapper/testing/functional/core/admin/AdminFunctionalSpec.groovy @@ -83,7 +83,7 @@ class AdminFunctionalSpec extends FunctionalSpec { "Java Version": "${json-unit.regex}17.*", "Java Vendor": "${json-unit.any-string}", "OS Name": "${json-unit.any-string}", - "OS Version": "${json-unit.matches:version}", + "OS Version": "${json-unit.any-string}", "OS Architecture": "${json-unit.any-string}", "Driver Manager Drivers Available": [ {