From a4fd625b993f54fa4b10d4d485c3406b501c8aac Mon Sep 17 00:00:00 2001
From: Artem Bilan <artem.bilan@broadcom.com>
Date: Mon, 24 Jun 2024 16:53:48 -0400
Subject: [PATCH] Update other workflows to use USW1 Artifactory

---
 .github/workflows/distribute-spring-enterprise.yml | 4 ++--
 .github/workflows/pr-build.yml                     | 6 ++++--
 .github/workflows/release.yml                      | 7 ++++---
 .github/workflows/verify-staged-artifacts.yml      | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/distribute-spring-enterprise.yml b/.github/workflows/distribute-spring-enterprise.yml
index 79fbc540..1cfac128 100644
--- a/.github/workflows/distribute-spring-enterprise.yml
+++ b/.github/workflows/distribute-spring-enterprise.yml
@@ -24,5 +24,5 @@ jobs:
       buildName: ${{ inputs.buildName }}
       buildNumber: ${{ inputs.buildNumber }}
     secrets:
-      ARTIFACTORY_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_USW1_USERNAME }}
-      ARTIFACTORY_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_USW1_PASSWORD }}
\ No newline at end of file
+      ARTIFACTORY_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}
+      ARTIFACTORY_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}
\ No newline at end of file
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index bbfe2ce5..e387a644 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -8,6 +8,8 @@ on:
 jobs:
   build-pull-request:
     uses: spring-io/spring-github-workflows/.github/workflows/spring-gradle-pull-request-build.yml@main
+    with:
+      runner: ubuntu22-2-8
     secrets:
-      ARTIFACTORY_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_USERNAME }}
-      ARTIFACTORY_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_RO_PASSWORD }}
+      ARTIFACTORY_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }}
+      ARTIFACTORY_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ab7bb958..ecac331b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,10 +14,11 @@ jobs:
 
     uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@main
     with:
-      artifactoryUrl: https://repo.spring.vmware.com
-      stagingRepository: spring-commercial-staging-local
-      targetReleaseRepository: spring-commercial-release-local
+      artifactoryUrl: https://usw1.packages.broadcom.com
+      stagingRepository: spring-enterprise-maven-stage-local
+      targetReleaseRepository: spring-enterprise-maven-prod-local
       artifactoryProjectKey: spring
+      runner: ubuntu22-2-8
     secrets:
       GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
       JF_ARTIFACTORY_SPRING: ${{ secrets.COMMERCIAL_JF_ARTIFACTORY_SPRING }}
diff --git a/.github/workflows/verify-staged-artifacts.yml b/.github/workflows/verify-staged-artifacts.yml
index f24fd5b7..003d79a0 100644
--- a/.github/workflows/verify-staged-artifacts.yml
+++ b/.github/workflows/verify-staged-artifacts.yml
@@ -14,7 +14,7 @@ env:
 
 jobs:
   verify-staged-with-samples:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu22-2-8
     steps:
 
       - name: Checkout Samples Repo
@@ -32,7 +32,7 @@ jobs:
           printf "allprojects {
                   repositories {
                     maven { 
-                      url 'https://repo.spring.vmware.com/artifactory/spring-commercial-staging-local'
+                      url 'https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-stage-local'
                       credentials {
                         username = '$ARTIFACTORY_USERNAME'
                         password = '$ARTIFACTORY_PASSWORD'