From 5cd203879bcb3cb0f015be08ee8380e75be564df Mon Sep 17 00:00:00 2001 From: Mohanachandran S Date: Fri, 2 Aug 2024 18:38:37 +0530 Subject: [PATCH] MOSIP-34948 - reverted to java11 Signed-off-by: Mohanachandran S --- .github/workflows/push-trigger.yml | 18 +++++++++--------- apitest/Dockerfile | 30 ++++++++++++++++++------------ apitest/pom.xml | 10 +++++----- 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 4d4d313dee..699c8ffaad 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -94,7 +94,7 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} build-maven-apitest-prereg: - uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 + uses: mosip/kattu/.github/workflows/maven-build.yml@master with: SERVICE_LOCATION: ./apitest BUILD_ARTIFACT: apitest-prereg @@ -108,7 +108,7 @@ jobs: publish_to_nexus_apitest_prereg: if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}" needs: build-maven-apitest-prereg - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21 + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master with: SERVICE_LOCATION: ./apitest secrets: @@ -128,12 +128,12 @@ jobs: SERVICE_LOCATION: apitest BUILD_ARTIFACT: apitest-prereg-local steps: - - uses: actions/checkout@v3 - - name: Set up JDK 21 - uses: actions/setup-java@v3 + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v1 with: - distribution: 'temurin' - java-version: '21' + ref: ${{ github.ref }} + java-version: '11' server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file - name: Setup the settings file for ossrh server @@ -176,7 +176,7 @@ jobs: ONLY_DOCKER: true fail-fast: false name: ${{ matrix.SERVICE_NAME }} - uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21 + uses: mosip/kattu/.github/workflows/docker-build.yml@master with: SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} SERVICE_NAME: ${{ matrix.SERVICE_NAME }} @@ -191,7 +191,7 @@ jobs: sonar_analysis_apitest_prereg: needs: build-maven-apitest-prereg if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master with: SERVICE_LOCATION: ./apitest secrets: diff --git a/apitest/Dockerfile b/apitest/Dockerfile index 31027c67d3..70a5d4db26 100644 --- a/apitest/Dockerfile +++ b/apitest/Dockerfile @@ -1,4 +1,4 @@ -FROM mosipdev/openjdk-21-jre:latest +FROM openjdk:11 ARG SOURCE ARG COMMIT_HASH @@ -23,6 +23,15 @@ ARG container_user_gid=1001 ARG KUBECTL_VERSION=1.22.9 +# install packages and create user +RUN apt-get -y update \ +&& apt-get install -y unzip jq \ +&& groupadd -g ${container_user_gid} ${container_user_group} \ +&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \ +&& curl -LO "https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \ +&& chmod +x kubectl \ +&& mv kubectl /usr/local/bin/ + # set working directory for the user WORKDIR /home/${container_user} @@ -32,17 +41,14 @@ ADD ./apitest/target/ $work_dir ADD entrypoint.sh $work_dir/entrypoint.sh -# install packages and create user -RUN apt-get -y update \ -&& apt-get install -y unzip jq curl \ -&& groupadd -g ${container_user_gid} ${container_user_group} \ -&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/bash -m ${container_user} \ -&& curl -LO "https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \ -&& mkdir -p /home/${container_user} \ -&& chmod +x kubectl $work_dir/entrypoint.sh \ -&& mv kubectl /usr/local/bin/ \ -&& chown -R ${container_user}:${container_user} /home/${container_user} /etc/ssl/certs/java/cacerts \ -&& chmod 644 /etc/ssl/certs/java/cacerts +RUN chmod +x $work_dir/entrypoint.sh + +#ADD ./testNgXmlFiles/ $work_dir/testNgXmlFiles/ + +# change permissions of file inside working dir +RUN chown -R ${container_user}:${container_user} /home/${container_user} /usr/local/openjdk-11/lib/security/cacerts + +RUN chmod 644 /usr/local/openjdk-11/lib/security/cacerts # select container user for all tasks USER ${container_user_uid}:${container_user_gid} diff --git a/apitest/pom.xml b/apitest/pom.xml index c3afcb27bb..e320205449 100644 --- a/apitest/pom.xml +++ b/apitest/pom.xml @@ -8,7 +8,7 @@ apitest-prereg Parent project of MOSIP Pre-Registration apitests https://github.com/mosip/pre-registration - 1.2.1-java21-SNAPSHOT + 1.2.1-SNAPSHOT @@ -37,8 +37,8 @@ UTF-8 - 21 - 21 + 11 + 11 3.8.0 3.0.2 3.1.0 @@ -49,14 +49,14 @@ 2.2.1 3.0.1 - apitest-prereg-1.2.1-java21-SNAPSHOT-jar-with-dependencies + apitest-prereg-1.2.1-SNAPSHOT-jar-with-dependencies io.mosip.testrig.apirig.apitest.commons apitest-commons - 1.2.1-java21-SNAPSHOT + 1.2.1-SNAPSHOT