From c0921b268a9ae3997f9ab58e9817b804a0faeac3 Mon Sep 17 00:00:00 2001
From: ybandala <ybandala@pulverdigital.com>
Date: Wed, 12 Feb 2025 01:04:19 -0600
Subject: [PATCH] updated pipline

---
 .github/workflows/build.yml | 42 +++++++++++++------------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a0de338b1..023b3b5ea 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,31 +1,17 @@
 name: Build and Deploy
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
 
 jobs:
   build:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     env:
       IMAGE_NAME: petclinic
       IMAGE_TAG: ${{ github.sha }}
       ARTIFACTORY_URL: petclinicmac.jfrog.io
+      DOCKER_REPO: petclinic-docker-remote
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-        cache: maven
-    
-    - name: Build with Maven
-      run: ./mvnw package -B
-
     - name: Setup JFrog CLI
       uses: jfrog/setup-jfrog-cli@v3
       with:
@@ -33,27 +19,27 @@ jobs:
       env:
         JF_URL: ${{ secrets.JF_URL }}
         JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }}
-        IMAGE_NAME: petclinic
-        IMAGE_TAG: ${{ github.sha }}
-        ARTIFACTORY_URL: petclinicmac.jfrog.io
-    
+
     - name: Build Docker Image
       run: |
         # Build Docker image
         docker build -t "${IMAGE_NAME}:${IMAGE_TAG}" .
-          
+        
         # Tag for Artifactory
-        docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${ARTIFACTORY_URL}/petclinic-docker-remote/${IMAGE_NAME}:${IMAGE_TAG}"
-        docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${ARTIFACTORY_URL}/petclinic-docker-remote/${IMAGE_NAME}:latest"
-    
+        docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${ARTIFACTORY_URL}/${DOCKER_REPO}/${IMAGE_NAME}:${IMAGE_TAG}"
+        docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${ARTIFACTORY_URL}/${DOCKER_REPO}/${IMAGE_NAME}:latest"
+
     - name: Login to Artifactory
       run: |
-        docker login -u${{ secrets.ARTIFACTORY_USERNAME }} ${{ secrets.JF_URL }} -p${{ secrets.ARTIFACTORY_PASSWORD }}
-    
+        echo "${{ secrets.ARTIFACTORY_PASSWORD }}" | docker login ${ARTIFACTORY_URL} -u${{ secrets.ARTIFACTORY_USERNAME }} --password-stdin
+
     - name: Push Image to Artifactory
       run: |
-        docker push "${ARTIFACTORY_URL}/petclinic-docker-remote/${IMAGE_NAME}:${IMAGE_TAG}"
-        docker push "${ARTIFACTORY_URL}/petclinic-docker-remote/${IMAGE_NAME}:latest"
+        docker push "${ARTIFACTORY_URL}/${DOCKER_REPO}/${IMAGE_NAME}:${IMAGE_TAG}"
+        docker push "${ARTIFACTORY_URL}/${DOCKER_REPO}/${IMAGE_NAME}:latest"
+
+    - name: Test
+      run: ./mvnw test
     
     # - name: Build Docker Image
     #   run: |