V1.1.5.5 rc3 test

.github/workflows/push_trigger.yml

@@ -91,3 +91,18 @@ jobs:
         echo VERSION=$VERSION
         docker tag $SERVICE_NAME $IMAGE_ID:$VERSION
         docker push $IMAGE_ID:$VERSION
+
+    - name: Publish the maven package
+      run: |
+        cd registration
+        mvn deploy -DskipTests -DaltDeploymentRepository=ossrh::default::${{ secrets.RELEASE_URL }} -s $GITHUB_WORKSPACE/settings.xml -f pom.xml
+      env:
+        GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        GPG_TTY: $(tty)
+    - name: Analyze with SonarCloud
+      run: |
+        cd registration
+        mvn clean -B verify sonar:sonar -Dsonar.projectKey=${{ secrets.PROJECT_KEY }} -Dsonar.organization=${{ secrets.ORG_KEY }} -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_TOKEN }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/regclient-manual_push_trigger.yml

@@ -0,0 +1,89 @@
+name: Manual push trigger
+
+on: workflow_dispatch
+
+jobs:
+
+  build_client:
+    runs-on: ubuntu-latest
+    env:
+      NAMESPACE: ${{ secrets. dev_namespace_docker_hub }}
+      SERVICE_NAME: registration-client
+      SERVICE_LOCATION: registration
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        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: Get current date
+      id: date
+      run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
+
+    - name: Setup branch and env
+      run: |
+        # Strip git ref prefix from version
+        echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV
+        echo "GPG_TTY=$(tty)" >> $GITHUB_ENV
+
+    - name: Setup branch and GPG public key
+      run: |
+        # Strip git ref prefix from version
+        echo ${{ env.BRANCH_NAME }}
+        echo ${{ env.GPG_TTY }}
+        sudo apt-get --yes install gnupg2
+#        gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg
+#        gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}}  --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg
+
+#    - uses: actions/cache@v1
+#      with:
+#        path: ~/.m2/repository
+#        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+#        restore-keys: |
+#          ${{ runner.os }}-maven-${{ env.BRANCH_NAME }}
+
+    - name: Setup the settings file for ossrh server
+      run: echo "<settings> <servers>  <server>  <id>ossrh</id>    <username>${{secrets.RELEASE_USER}}</username> <password>${{secrets.RELEASE_TOKEN}}</password> </server> </servers> <profiles> <profile>     <id>ossrh</id> <activation> <activeByDefault>true</activeByDefault> </activation>  <properties> <gpg.executable>gpg2</gpg.executable> <gpg.passphrase>${{secrets.gpg_secret}}</gpg.passphrase> </properties> </profile> <profile> <id>allow-snapshots</id>       <activation><activeByDefault>true</activeByDefault></activation> <repositories> <repository>        <id>snapshots-repo</id> <url>https://oss.sonatype.org/content/repositories/snapshots</url> <releases><enabled>false</enabled></releases> <snapshots><enabled>true</enabled></snapshots> </repository>  <repository>         <id>central</id>  <url>https://repo1.maven.org/maven2</url>         <releases><enabled>true</enabled></releases>         <snapshots><enabled>false</enabled></snapshots> </repository> </repositories>  </profile> <profile> <id>sonar</id> <properties>  <sonar.sources>.</sonar.sources> <sonar.host.url>https://sonarcloud.io</sonar.host.url>  </properties> <activation> <activeByDefault>false</activeByDefault> </activation> </profile> </profiles> </settings>" > $GITHUB_WORKSPACE/settings.xml
+
+    - name: Install xmllint
+      run: |
+        sudo apt-get update
+        sudo apt-get install libxml2-utils
+
+    - name: Build with Maven
+      run: |
+        cd registration
+        mvn -B package --file pom.xml -s $GITHUB_WORKSPACE/settings.xml -DskipTests -Dgpg.skip=true
+
+    - name: Get version info from pom
+      id: getPomVersion
+      uses: mavrosxristoforos/[email protected]
+      with:
+        xml-file: ./${{ env.SERVICE_LOCATION }}/pom.xml
+        xpath: /*[local-name()="project"]/*[local-name()="version"]
+
+    - name: Build image
+      run: |
+        cd "./${{env.SERVICE_LOCATION}}"
+        docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }}
+
+    - name: Log into registry
+      run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin
+
+    - name: Push image
+      run: |
+        IMAGE_ID=$NAMESPACE/$SERVICE_NAME
+
+        # Change all uppercase to lowercase
+        IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+        echo "push version ${{steps.getPomVersion.outputs.info}}"
+        VERSION=$BRANCH_NAME
+        echo IMAGE_ID=$IMAGE_ID
+        echo VERSION=$VERSION
+        docker tag $SERVICE_NAME $IMAGE_ID:$VERSION
+        docker push $IMAGE_ID:$VERSION

registration/.gitignore

@@ -13,7 +13,6 @@ bin/
 tmp/
 *.tmp
 *.html
-*.json
 *.bak
 *.swp
 *~.nib

registration/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11
+FROM mosipdev/javafx-reg-client-openjdk:latest
 
 RUN apt-get update
 
@@ -14,10 +14,6 @@ ARG client_upgrade_server
 
 ARG cert_server_URL
 
-ARG tpm_enabled
-
-ARG db_bootpwd
-
 ENV client_version_env=${client_version}
 
 ENV crypto_key_env=${crypto_key}
@@ -30,16 +26,18 @@ ENV client_repo_env=${client_repo_url}
 
 ENV client_certificate_env=${client_certificate}
 
-ENV tpm_enabled_env=${tpm_enabled}
-
-ENV db_bootpwd_env=${db_bootpwd}
+ENV artifactory_url_env=${artifactory_url}
 
 ADD registration-client/target /registration-client/target
 
 ADD registration-libs/target /registration-libs/target
 
 ADD registration-libs/src/main/resources registration-libs/resources
 
+ADD registration-test/target /registration-test/target
+
+ADD /registration-test/src/main/resources /registration-test/resources
+
 ADD configure.sh configure.sh
 
 RUN chmod a+x configure.sh \

registration/configure.sh

@@ -6,16 +6,13 @@ echo "Started with args"
 
 client_version_env="$client_version_env" #We should pick this from the jar not as an argument.
 crypto_key_env="$crypto_key_env" #key to encrypt the jar files
-client_tpm_enabled="$tpm_enabled_env" #Not used as of now
 client_certificate="$client_certificate_env" # Not used as of now
 client_upgrade_server="$client_upgrade_server_env" #docker hosted url
 reg_client_sdk_url="$reg_client_sdk_url_env"
+artifactory_url="$artifactory_url_env"
 
 echo "initalized variables"
 
-#download the certificate at runtime from the certificate store
-#wget -O mosip_cer.cer "${client_certificate_url}"
-
 mkdir -p /registration-libs/target/props
 
 echo "mosip.reg.app.key=${crypto_key_env}" > /registration-libs/target/props/mosip-application.properties
@@ -26,7 +23,7 @@ echo "mosip.reg.rollback.path=../BackUp" >> /registration-libs/target/props/mosi
 echo "mosip.reg.cerpath=/cer/mosip_cer.cer" >> /registration-libs/target/props/mosip-application.properties
 echo "mosip.reg.dbpath=db/reg" >> /registration-libs/target/props/mosip-application.properties
 echo "mosip.reg.xml.file.url=${client_upgrade_server}/registration-client/maven-metadata.xml" >> /registration-libs/target/props/mosip-application.properties
-echo "mosip.reg.client.tpm.availability=${client_tpm_enabled}" >> /registration-libs/target/props/mosip-application.properties
+echo "mosip.reg.client.tpm.availability=Y" >> /registration-libs/target/props/mosip-application.properties
 echo "mosip.client.upgrade.server.url=${client_upgrade_server}" >> /registration-libs/target/props/mosip-application.properties
 
 echo "created mosip-application.properties"
@@ -45,14 +42,9 @@ then
 	cp /sdkDependency/*.jar /sdkjars/
 else
 	echo "Downloading MOCK SDK..."
-	wget https://repo1.maven.org/maven2/io/mosip/mock/sdk/mock-sdk/0.9/mock-sdk-0.9.jar -P /sdkjars/
+	wget "${artifactory_url}/artifactory/libs-release-local/mock-sdk/1.1.5/mock-sdk.jar" -O /sdkjars/mock-sdk.jar
 fi
 
-## download Open JRE 11 + FX
-#wget https://cdn.azul.com/zulu/bin/zulu11.41.23-ca-fx-jre11.0.8-win_x64.zip -O zulu11.41.23-ca-fx-jre11.0.8-win_x64.zip
-
-cp /registration-libs/resources/zulu11.41.23-ca-fx-jre11.0.8-win_x64.zip /
-
 #unzip Jre to be bundled
 /usr/bin/unzip /zulu11.41.23-ca-fx-jre11.0.8-win_x64.zip
 mkdir -p /registration-libs/resources/jre
@@ -78,16 +70,29 @@ ls -ltr lib | grep bc
 /usr/bin/zip -r reg-client.zip lib
 #/usr/bin/zip reg-client.zip MANIFEST.MF
 
+#Creating Regclient testing framework
+mkdir -p /registration-test-utility
+mkdir -p /registration-test-utility/lib
+cp /registration-test/target/registration-test-*-dependencies.jar /registration-test-utility/registration-test.jar
+cp /registration-test/resources/*  /registration-test-utility/
+cp -r /registration-libs/resources/jre /registration-test-utility/
+cp -r /registration-client/target/lib/morena* /registration-test-utility/lib
+cp -r /sdkjars/*.jar /registration-test-utility/lib
+cp /registration-client/target/MANIFEST.MF /registration-test-utility/
+/usr/bin/zip -r /registration-test-utility.zip /registration-test-utility
+
 echo "setting up nginx static content"
 
 mkdir -p /var/www/html/registration-client
 mkdir -p /var/www/html/registration-client/${client_version_env}
 mkdir -p /var/www/html/registration-client/${client_version_env}/lib
+mkdir -p /var/www/html/registration-test/${client_version_env}
 
 cp /registration-client/target/lib/* /var/www/html/registration-client/${client_version_env}/lib
 cp /registration-client/target/MANIFEST.MF /var/www/html/registration-client/${client_version_env}/
 cp /build_files/maven-metadata.xml /var/www/html/registration-client/
 cp reg-client.zip /var/www/html/registration-client/${client_version_env}/
+cp /registration-test-utility.zip /var/www/html/registration-test/${client_version_env}/
 
 echo "setting up nginx static content - completed"