Merge pull request #10383 from hmislk/development

Updates from development
hmislk · Feb 3, 2025 · 25b66e9 · 25b66e9
2 parents aa7ef56 + 8b64bdf
commit 25b66e9
Show file tree

Hide file tree

Showing 81 changed files with 6,213 additions and 1,824 deletions.
diff --git a/.github/workflows/coop_dev_ci_cd.yml b/.github/workflows/coop_dev_ci_cd.yml
@@ -40,10 +40,11 @@ jobs:
         run: mvn clean package -DskipTests
 
       - name: Archive Build Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
           path: target/*.war
+          overwrite: true
 
       # - name: Run Tests
       #   run: mvn test
@@ -57,7 +58,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-artifacts
           path: ./
@@ -81,9 +82,8 @@ jobs:
 
           # Ensure deployment directory exists
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo mkdir -p $WAR_DIR
-            sudo chown -R appuser:appuser /home/appuser/app/latest
-            sudo su - appuser
+            mkdir -p $WAR_DIR
+            chown -R appuser:appuser $WAR_DIR
             cd $WAR_DIR
 
             # Remove old backup if it exists
@@ -98,27 +98,24 @@ jobs:
           "
  
           # Copy new WAR file to the server
-          rsync -aL --progress -e "ssh -i private_key.pem" ./*.war $SERVER_USER@$SERVER_IP:/tmp/$WAR_NAME
+          rsync -aL --progress -e "ssh -i private_key.pem" ./*.war $SERVER_USER@$SERVER_IP:$WAR_DIR/$WAR_NAME
 
-          # Move the file to /home/appuser/app/latest/ and set permissions
+          # Set the WAR file permission
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo mv /tmp/$WAR_NAME $WAR_DIR/
-            sudo chown appuser:appuser $WAR_DIR/$WAR_NAME
+            chown appuser:appuser $WAR_DIR/$WAR_NAME
           "
 
           # Deploy the WAR using asadmin
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo su - appuser
-            echo 'AS_ADMIN_PASSWORD=${{ secrets.DEV_PAYARA_ADMIN_PASS }}' > /tmp/payara-admin-pass.txt
+            echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
             /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt undeploy $APP_NAME || true
             /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt deploy --force=true --contextroot $APP_NAME $WAR_DIR/$WAR_NAME
             rm /tmp/payara-admin-pass.txt
           "
 
           # Validate if the application is running
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo su - appuser
-            echo 'AS_ADMIN_PASSWORD=${{ secrets.DEV_PAYARA_ADMIN_PASS }}' > /tmp/payara-admin-pass.txt
+            echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
             if /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt list-applications | grep -q '$APP_NAME'; then
               echo 'Application is running.'
             else

diff --git a/.github/workflows/coop_prod_ci_cd.yml b/.github/workflows/coop_prod_ci_cd.yml
@@ -40,10 +40,11 @@ jobs:
         run: mvn clean package -DskipTests
 
       - name: Archive Build Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
           path: target/*.war
+          overwrite: true
 
       # - name: Run Tests
       #   run: mvn test
@@ -59,7 +60,7 @@ jobs:
           ref: 'coop-prod'
 
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-artifacts
           path: ./

diff --git a/.github/workflows/coop_stg_ci_cd.yml b/.github/workflows/coop_stg_ci_cd.yml
@@ -37,7 +37,7 @@ jobs:
           grep '<jta-data-source>' src/main/resources/META-INF/persistence.xml
 
       - name: Build with Maven
-        run: mvn clean package -DskipTests -DfinalName=hmis
+        run: mvn clean package -DskipTests
 
       - name: Archive Build Artifacts
         uses: actions/upload-artifact@v4
@@ -82,9 +82,8 @@ jobs:
 
           # Ensure deployment directory exists
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo mkdir -p $WAR_DIR
-            sudo chown -R appuser:appuser /home/appuser/app/latest
-            sudo su - appuser
+            mkdir -p $WAR_DIR
+            chown -R appuser:appuser $WAR_DIR
             cd $WAR_DIR
 
             # Remove old backup if it exists
@@ -99,27 +98,24 @@ jobs:
           "
 
           # Copy new WAR file to the server
-          rsync -aL --progress -e "ssh -i private_key.pem" ./*.war $SERVER_USER@$SERVER_IP:/tmp/$WAR_NAME
+          rsync -aL --progress -e "ssh -i private_key.pem" ./*.war $SERVER_USER@$SERVER_IP:$WAR_DIR/$WAR_NAME
 
-          # Move the file to /home/appuser/app/latest/ and set permissions
+          # Set the WAR file permission
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo mv /tmp/$WAR_NAME $WAR_DIR/
-            sudo chown appuser:appuser $WAR_DIR/$WAR_NAME
+            chown appuser:appuser $WAR_DIR/$WAR_NAME
           "
 
           # Deploy the WAR using asadmin
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo su - appuser
-            echo 'AS_ADMIN_PASSWORD=${{ secrets.COOP_STG_PAYARA_ADMIN_PASS }}' > /tmp/payara-admin-pass.txt
+            echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
             /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt undeploy $APP_NAME || true
             /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt deploy --force=true --contextroot $APP_NAME $WAR_DIR/$WAR_NAME
             rm /tmp/payara-admin-pass.txt
           "
 
           # Validate if the application is running
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo su - appuser
-            echo 'AS_ADMIN_PASSWORD=${{ secrets.COOP_STG_PAYARA_ADMIN_PASS }}' > /tmp/payara-admin-pass.txt
+            echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
             if /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt list-applications | grep -q '$APP_NAME'; then
               echo 'Application is running.'
             else

diff --git a/.github/workflows/mp_prod_ci_cd.yml b/.github/workflows/mp_prod_ci_cd.yml
@@ -40,10 +40,11 @@ jobs:
         run: mvn clean package -DskipTests
 
       - name: Archive Build Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
           path: target/*.war
+          overwrite: true
 
       # - name: Run Tests
       #   run: mvn test
@@ -57,7 +58,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-artifacts
           path: ./
@@ -75,15 +76,15 @@ jobs:
 
           # Variables
           WAR_NAME="mp.war"
-          WAR_DIR="/home/appuser/app/latest"
+          WAR_DIR="/home/appadmin/app/latest"
           APP_NAME="mp"
           SUBDOMAIN="mp"
 
           # Ensure deployment directory exists
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
             sudo mkdir -p $WAR_DIR
-            sudo chown -R appuser:appuser /home/appuser/app/latest
-            sudo su - appuser
+            sudo chown -R appadmin:appadmin /home/appadmin/app/latest
+            sudo su - appadmin
             cd $WAR_DIR
 
             # Remove old backup if it exists
@@ -103,23 +104,23 @@ jobs:
           # Move the file to /home/appuser/app/latest/ and set permissions
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
             sudo mv /tmp/$WAR_NAME $WAR_DIR/
-            sudo chown appuser:appuser $WAR_DIR/$WAR_NAME
+            sudo chown appadmin:appadmin $WAR_DIR/$WAR_NAME
           "
 
           # Deploy the WAR using asadmin
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo su - appuser
+            sudo su - appadmin
             echo 'AS_ADMIN_PASSWORD=${{ secrets.MP_PROD_PAYARA_ADMIN_PASS }}' > /tmp/payara-admin-pass.txt
-            /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt undeploy $APP_NAME || true
-            /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt deploy --force=true --contextroot $APP_NAME $WAR_DIR/$WAR_NAME
+            /opt/payara5/glassfish/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt undeploy $APP_NAME || true
+            /opt/payara5/glassfish/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt deploy --force=true --contextroot $APP_NAME $WAR_DIR/$WAR_NAME
             rm /tmp/payara-admin-pass.txt
           "
 
           # Validate if the application is running
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo su - appuser
+            sudo su - appadmin
             echo 'AS_ADMIN_PASSWORD=${{ secrets.MP_PROD_PAYARA_ADMIN_PASS }}' > /tmp/payara-admin-pass.txt
-            if /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt list-applications | grep -q '$APP_NAME'; then
+            if /opt/payara5/glassfish/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt list-applications | grep -q '$APP_NAME'; then
               echo 'Application is running.'
             else
               echo 'Application failed to start.'

diff --git a/.github/workflows/rh_dev_ci_cd.yml b/.github/workflows/rh_dev_ci_cd.yml
@@ -31,7 +31,7 @@ jobs:
         run: |
           sed -i 's|<jta-data-source>${JDBC_DATASOURCE}</jta-data-source>|<jta-data-source>jdbc/ruhunu</jta-data-source>|' src/main/resources/META-INF/persistence.xml
           sed -i 's|<jta-data-source>${JDBC_AUDIT_DATASOURCE}</jta-data-source>|<jta-data-source>jdbc/ruhunuAudit</jta-data-source>|' src/main/resources/META-INF/persistence.xml
-      
+
       - name: Verify JDBC Data Sources in persistence.xml
         run: |
           grep '<jta-data-source>' src/main/resources/META-INF/persistence.xml
@@ -40,10 +40,11 @@ jobs:
         run: mvn clean package -DskipTests
 
       - name: Archive Build Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
           path: target/*.war
+          overwrite: true
 
       # - name: Run Tests
       #   run: mvn test
@@ -57,7 +58,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-artifacts
           path: ./
@@ -81,9 +82,8 @@ jobs:
 
           # Ensure deployment directory exists
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo mkdir -p $WAR_DIR
-            sudo chown -R appuser:appuser /home/appuser/app/latest
-            sudo su - appuser
+            mkdir -p $WAR_DIR
+            chown -R appuser:appuser $WAR_DIR
             cd $WAR_DIR
 
             # Remove old backup if it exists
@@ -98,27 +98,24 @@ jobs:
           "
 
           # Copy new WAR file to the server
-          rsync -aL --progress -e "ssh -i private_key.pem" ./*.war $SERVER_USER@$SERVER_IP:/tmp/$WAR_NAME
+          rsync -aL --progress -e "ssh -i private_key.pem" ./*.war $SERVER_USER@$SERVER_IP:$WAR_DIR/$WAR_NAME
 
-          # Move the file to /home/appuser/app/latest/ and set permissions
+          # Set the WAR file permission
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo mv /tmp/$WAR_NAME $WAR_DIR/
-            sudo chown appuser:appuser $WAR_DIR/$WAR_NAME
+            chown appuser:appuser $WAR_DIR/$WAR_NAME
           "
 
           # Deploy the WAR using asadmin
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo su - appuser
-            echo 'AS_ADMIN_PASSWORD=${{ secrets.DEV_PAYARA_ADMIN_PASS }}' > /tmp/payara-admin-pass.txt
+            echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
             /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt undeploy $APP_NAME || true
             /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt deploy --force=true --contextroot $APP_NAME $WAR_DIR/$WAR_NAME
             rm /tmp/payara-admin-pass.txt
           "
 
           # Validate if the application is running
           ssh -i private_key.pem -o StrictHostKeyChecking=no $SERVER_USER@$SERVER_IP "
-            sudo su - appuser
-            echo 'AS_ADMIN_PASSWORD=${{ secrets.DEV_PAYARA_ADMIN_PASS }}' > /tmp/payara-admin-pass.txt
+            echo 'AS_ADMIN_PASSWORD=$PAYARA_ADMIN_PASS' > /tmp/payara-admin-pass.txt
             if /opt/payara5/bin/asadmin --user admin --passwordfile /tmp/payara-admin-pass.txt list-applications | grep -q '$APP_NAME'; then
               echo 'Application is running.'
             else

diff --git a/.github/workflows/rh_prod_ci_cd.yml b/.github/workflows/rh_prod_ci_cd.yml
@@ -40,10 +40,11 @@ jobs:
         run: mvn clean package -DskipTests
 
       - name: Archive Build Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
           path: target/*.war
+          overwrite: true
 
       # - name: Run Tests
       #   run: mvn test
@@ -57,7 +58,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build-artifacts
           path: ./