diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 2f8df981..96cc385a 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -51,10 +51,69 @@ jobs: if: "${{ github.event_name != 'pull_request' }}" uses: mosip/kattu/.github/workflows/npm-sonar-analysis.yml@master with: - SERVICE_LOCATION: ./resident-ui + SERVICE_LOCATION: resident-ui SONAR_URL: 'https://sonarcloud.io' PROJECT_KEY: "mosip_${{ github.event.repository.name }}" secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} ORG_KEY: ${{ secrets.ORG_KEY }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + build-maven-residenttest: + uses: mosip/kattu/.github/workflows/maven-build.yml@master + with: + SERVICE_LOCATION: ./residenttest + BUILD_ARTIFACT: residenttest + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + build-docker-residenttest: + needs: build-maven-residenttest + strategy: + matrix: + include: + - SERVICE_LOCATION: 'residenttest' + SERVICE_NAME: 'residenttest' + BUILD_ARTIFACT: 'residenttest' + fail-fast: false + name: ${{ matrix.SERVICE_NAME }} + uses: mosip/kattu/.github/workflows/docker-build.yml@master + with: + SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} + SERVICE_NAME: ${{ matrix.SERVICE_NAME }} + BUILD_ARTIFACT: ${{ matrix.BUILD_ARTIFACT }} + secrets: + DEV_NAMESPACE_DOCKER_HUB: ${{ secrets.DEV_NAMESPACE_DOCKER_HUB }} + ACTOR_DOCKER_HUB: ${{ secrets.ACTOR_DOCKER_HUB }} + RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + publish_to_nexus: + if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}" + needs: build-maven-residenttest + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master + with: + SERVICE_LOCATION: residenttest + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + sonar_analysis: + needs: build-maven-residenttest + if: "${{ github.event_name != 'pull_request' }}" + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master + with: + SERVICE_LOCATION: residenttest + secrets: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + ORG_KEY: ${{ secrets.ORG_KEY }} + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} diff --git a/.github/workflows/release-changes.yml b/.github/workflows/release-changes.yml index 0857aee9..095aff70 100644 --- a/.github/workflows/release-changes.yml +++ b/.github/workflows/release-changes.yml @@ -25,4 +25,5 @@ jobs: SNAPSHOT_TAG: ${{ inputs.SNAPSHOT_TAG }} BASE: ${{ inputs.BASE }} secrets: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} \ No newline at end of file + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + ACTION_PAT: ${{ secrets.ACTION_PAT }} \ No newline at end of file diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index c4939a6e..9a5b079f 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -31,3 +31,5 @@ jobs: BODY: ${{ inputs.BODY }} PRE_RELEASE: ${{ inputs.PRE_RELEASE }} DRAFT: ${{ inputs.DRAFT }} + secrets: + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} \ No newline at end of file diff --git a/residenttest/Dockerfile b/residenttest/Dockerfile index df0e7082..0c8f0748 100644 --- a/residenttest/Dockerfile +++ b/residenttest/Dockerfile @@ -32,7 +32,7 @@ RUN groupadd -g ${container_user_gid} ${container_user_group} \ USER ${container_user_uid}:${container_user_gid} COPY --chown=${container_user_uid}:${container_user} --chmod=771 ./entrypoint.sh ${work_dir}/entrypoint.sh -COPY --chown=${container_user}:${container_user} ./build_files/ ${work_dir} +COPY --chown=${container_user}:${container_user} ./src/main/resources/ ${work_dir} # set working directory WORKDIR ${work_dir} diff --git a/residenttest/pom.xml b/residenttest/pom.xml index 186481f8..38234fc0 100644 --- a/residenttest/pom.xml +++ b/residenttest/pom.xml @@ -1,34 +1,34 @@ - 4.0.0 - io.mosip.test - residentui - 1.2.1 - resident-ui-automation - resident-ui-automation - https://github.com/mosip/resident-ui - - - - MPL 2.0 - https://www.mozilla.org/en-US/MPL/2.0/ - - - - scm:git:git://github.com/mosip/resident-ui.git - scm:git:ssh://github.com:mosip/resident-ui.git - https://github.com/mosip/resident-ui - HEAD - + 4.0.0 + io.mosip.test + residentui + 1.2.1 + resident-ui-automation + resident-ui-automation + https://github.com/mosip/resident-ui + + + + MPL 2.0 + https://www.mozilla.org/en-US/MPL/2.0/ + + + + scm:git:git://github.com/mosip/resident-ui.git + scm:git:ssh://github.com:mosip/resident-ui.git + https://github.com/mosip/resident-ui + HEAD + - - Mosip - mosip.emailnotifier@gmail.com - io.mosip - https://github.com/mosip/resident-ui - - - - + + Mosip + mosip.emailnotifier@gmail.com + io.mosip + https://github.com/mosip/resident-ui + + + + UTF-8 @@ -125,9 +125,9 @@ 1.9.12 0.6.0 2.0.0.AM2 - - - + + + @@ -183,16 +183,61 @@ 6.11 1.13 residentui-1.2.1-SNAPSHOT-jar-with-dependencies - + - - - + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + pl.project13.maven + git-commit-id-plugin + 3.0.1 + + + get-the-git-infos + + revision + + validate + + + + true + ${project.build.outputDirectory}/git.properties + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + ${project.basedir}/.git + + + maven-compiler-plugin 3.5.1 @@ -202,282 +247,303 @@ -Dfile.encoding=UTF-8 - + - pl.project13.maven - git-commit-id-plugin - 3.0.1 - - - populate-git-commit-information - - revision - - - true - MM/dd/yyyy HH:mm:ss Z - 8 - true - ${project.build.outputDirectory}/git.properties - - - - - ${project.basedir}/.git - - - - - - - + + + + + + + + + pl.project13.maven + git-commit-id-plugin + 3.0.1 + + + populate-git-commit-information + + revision + + true + MM/dd/yyyy HH:mm:ss Z + 8 + true + ${project.build.outputDirectory}/git.properties + - - - true - lib/ - io.mosip.testrunner.MosipTestRunner - - - - jar-with-dependencies - + ${project.basedir}/.git - --> - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - - shade - - - ${fileName} - - - - - - io.mosip.testrig.residentui.utility.TestRunner - - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - - - - - - selenium-tests - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - + + + + + + - org.apache.maven.plugins - maven-javadoc-plugin - 3.2.0 - - - attach-javadocs - - jar - - - - - none - - - - org.apache.maven.plugins - maven-source-plugin - true - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - - testng.xml - - - - - - - - - - - + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + + + + shade + + + ${fileName} + + + + + + io.mosip.testrig.residentui.utility.TestRunner + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + + + + + + selenium-tests + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 + + + attach-javadocs + + jar + + + + + none + + + + org.apache.maven.plugins + maven-source-plugin + true + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.4 + + + testng.xml + + + + + + + + + + + org.seleniumhq.selenium selenium-java 3.141.59 - - - - - org.json - json - 20210307 - - - - - com.fasterxml.jackson.core - jackson-core - 2.12.5 - - - - com.fasterxml.jackson.core - jackson-databind - 2.12.5 - - - com.amazonaws - aws-java-sdk-s3 - 1.12.470 - - - - - org.awaitility - awaitility - 4.0.3 - - - ch.qos.logback - logback-core - 1.2.6 - - - org.slf4j - slf4j-api - 1.7.30 - - - - - ch.qos.logback - logback-classic - 1.2.6 - - - com.paulhammant - ngwebdriver - 1.1.5 - - - - - com.aventstack - extentreports - 5.0.9 - - - - - - io.github.bonigarcia - webdrivermanager - 5.1.0 - - - - org.testng - testng - 7.1.0 - - - - - - commons-io - commons-io - 2.6 - - - - - - org.jboss.resteasy - resteasy-jaxrs - 3.15.0.Final - - - - - - - junit - junit - 3.8.1 - test - + + + + + org.json + json + 20210307 + + + + + com.fasterxml.jackson.core + jackson-core + 2.12.5 + + + + com.fasterxml.jackson.core + jackson-databind + 2.12.5 + + + com.amazonaws + aws-java-sdk-s3 + 1.12.470 + + + + + org.awaitility + awaitility + 4.0.3 + + + ch.qos.logback + logback-core + 1.2.6 + + + org.slf4j + slf4j-api + 1.7.30 + + + + + ch.qos.logback + logback-classic + 1.2.6 + + + com.paulhammant + ngwebdriver + 1.1.5 + + + + + com.aventstack + extentreports + 5.0.9 + + + + + + io.github.bonigarcia + webdrivermanager + 5.1.0 + + + + org.testng + testng + 7.1.0 + + + + + + commons-io + commons-io + 2.6 + + + + + + org.jboss.resteasy + resteasy-jaxrs + 3.15.0.Final + + + + + + + junit + junit + 3.8.1 + test + org.testng testng @@ -499,9 +565,9 @@ 1.6.2 - javax.ws.rs - javax.ws.rs-api - 2.1.1 + javax.ws.rs + javax.ws.rs-api + 2.1.1 org.json @@ -529,10 +595,10 @@ ${commons-collections4.version} - commons-lang - commons-lang - 2.6 + commons-lang + commons-lang + 2.6 - +