[CI] update jfrog usage

spring-cloud · Oct 4, 2024 · 738effb · 738effb
1 parent 2ddf026
commit 738effb
Show file tree

Hide file tree

Showing 19 changed files with 62 additions and 61 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -11,6 +11,7 @@ on:
         type: boolean
         default: false
         description: 'Delete the image tags'
+
 env:
   ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
   ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}

diff --git a/.github/workflows/build-snapshot-worker.yml b/.github/workflows/build-snapshot-worker.yml
@@ -9,7 +9,8 @@ on:
         required: true
 
 env:
-  MAVEN_THREADS: '-T 1'
+  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
 
 jobs:
   build:
@@ -38,11 +39,10 @@ jobs:
     - uses: jfrog/setup-jfrog-cli@v4
       env:
         JF_URL: 'https://repo.spring.io'
-        JF_USER: ${{ secrets.ARTIFACTORY_USERNAME }}
-        JF_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+        JF_ACCESS_TOKEN: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Configure JFrog Cli
       run: |
-        jfrog config add repo.spring.io --url="https://repo.spring.io" --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD"  --interactive=false --overwrite=true
+        jfrog config add repo.spring.io --url="https://repo.spring.io" --access-token="${{ secrets.JF_ARTIFACTORY_SPRING }}"  --interactive=false --overwrite=true
         jfrog mvnc --use-wrapper \
           --server-id-resolve=repo.spring.io \
           --server-id-deploy=repo.spring.io \
@@ -62,10 +62,10 @@ jobs:
       env:
         MVN: 'jfrog mvn'
       run: |
-        $MVN --help
+        ./mvnw --help
         ./spring-cloud-dataflow-package/set-package-version.sh
-        $MVN -s .settings.xml install -Pfull,docs -B
-        $MVN -s .settings.xml install -pl spring-cloud-dataflow-package -B
+        jfrog mvn -s .settings.xml install -Pfull,docs -B
+        jfrog mvn -s .settings.xml install -pl spring-cloud-dataflow-package -B
         jfrog rt build-publish        
         PROJECT_VERSION=$($MVN help:evaluate -Dexpression=project.version -q -DforceStdout)
         echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$PROJECT_VERSION >> $GITHUB_ENV

diff --git a/.github/workflows/cental-sync.yml b/.github/workflows/cental-sync.yml
@@ -22,8 +22,7 @@ jobs:
     - uses: jfrog/setup-jfrog-cli@v4
       env:
         JF_URL: 'https://repo.spring.io'
-        JF_USER: ${{ secrets.ARTIFACTORY_USERNAME }}
-        JF_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+
 
     # Extract build id from input
     - name: Extract Build Id

diff --git a/.github/workflows/central-release.yml b/.github/workflows/central-release.yml
@@ -20,8 +20,7 @@ jobs:
     - uses: jfrog/setup-jfrog-cli@v4
       env:
         JF_URL: 'https://repo.spring.io'
-        JF_USER: ${{ secrets.ARTIFACTORY_USERNAME }}
-        JF_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+
 
     # zoo extract and ensure
     - name: Extract Zoo Context Properties

diff --git a/.github/workflows/ci-images.yml b/.github/workflows/ci-images.yml
@@ -13,6 +13,10 @@ on:
         default: false
         description: 'Delete the image tags'
 
+env:
+  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+
 jobs:
   prepare:
     name: Prepare Build
@@ -45,9 +49,4 @@ jobs:
     with:
       version: ${{ needs.prepare.outputs.version }}
       delete-tags: ${{ inputs.delete-tags == 'true' }}
-    secrets:
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-      GCR_JSON_KEY: ${{ secrets.GCR_JSON_KEY }}
-      ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-      ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+    secrets: inherit
diff --git a/.github/workflows/ci-it-db.yml b/.github/workflows/ci-it-db.yml
@@ -5,6 +5,10 @@ on:
   schedule:
     - cron: '0 6 * * 1-5'
 
+env:
+  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+
 jobs:
   integration-test:
     name: DB IT on ${{ matrix.group }}
@@ -29,9 +33,6 @@ jobs:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: 'Action: Run Db IT'
-      env:
-        ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-        ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
       run: |
         ./mvnw clean install -DskipTests -T 1C -s .settings.xml -pl spring-cloud-dataflow-server -am  
         ./mvnw \

diff --git a/.github/workflows/ci-it-performance.yml b/.github/workflows/ci-it-performance.yml
@@ -4,6 +4,7 @@ on:
   workflow_dispatch:
   schedule:
     - cron: '0 6 * * 1'
+
 env:
   ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
   ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}

diff --git a/.github/workflows/ci-it-security.yml b/.github/workflows/ci-it-security.yml
@@ -5,6 +5,10 @@ on:
   schedule:
     - cron: '0 6 * * 1'
 
+env:
+  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+
 jobs:
   test:
     name: Security IT
@@ -27,9 +31,7 @@ jobs:
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Run Security IT
-      env:
-        ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-        ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+      shell: bash
       run: |
         ./mvnw clean install -DskipTests -T 1C -s .settings.xml -pl spring-cloud-dataflow-server -am
         ./mvnw -s .settings.xml \

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,6 +46,7 @@ jobs:
         JF_ACCESS_TOKEN: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Configure JFrog Cli
       run: |
+        jfrog config add repo.spring.io --url="https://repo.spring.io" --access-token="${{ secrets.JF_ARTIFACTORY_SPRING }}"  --interactive=false --overwrite=true
         jfrog mvnc --use-wrapper \
           --server-id-resolve=repo.spring.io \
           --server-id-deploy=repo.spring.io \

diff --git a/.github/workflows/export-app-versions.sh b/.github/workflows/export-app-versions.sh
@@ -1,20 +1,18 @@
 #!/usr/bin/env bash
 set +e
-if [ "$MVN" = "" ]; then
-    MVN=./mvnw
-fi
-$MVN --version
-$MVN help:evaluate -Dexpression=project.version > /dev/null
-DATAFLOW_VERSION=$($MVN help:evaluate -Dexpression=project.version -q -DforceStdout)
+
+./mvnw --version
+./mvnw help:evaluate -Dexpression=project.version > /dev/null
+DATAFLOW_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
 RC=$?
 if ((RC!=0)); then
     echo "DATAFLOW_VERSION=$DATAFLOW_VERSION"
     exit $RC
 fi
 echo "DATAFLOW_VERSION=$DATAFLOW_VERSION"
-SKIPPER_VERSION=$($MVN help:evaluate -Dexpression=spring-cloud-skipper.version  -pl spring-cloud-dataflow-parent -q -DforceStdout)
+SKIPPER_VERSION=$(./mvnw help:evaluate -Dexpression=spring-cloud-skipper.version  -pl spring-cloud-dataflow-parent -q -DforceStdout)
 if [[ "$SKIPPER_VERSION" = *"ERROR"* ]]; then
-    SKIPPER_VERSION=$($MVN help:evaluate -Dexpression=spring-cloud-skipper.version -q -DforceStdout)
+    SKIPPER_VERSION=$(./mvnw help:evaluate -Dexpression=spring-cloud-skipper.version -q -DforceStdout)
 fi
 RC=$?
 if ((RC!=0)); then

diff --git a/.github/workflows/fix-deployment-files.yml b/.github/workflows/fix-deployment-files.yml
@@ -5,6 +5,10 @@ on:
     branches:
       - main
 
+env:
+  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+
 jobs:
   build:
 

diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
@@ -7,6 +7,10 @@ on:
         description: 'Build Zoo Handler Payload'
         required: true
 
+env:
+  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+
 jobs:
   ghrelease:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/milestone-worker.yml b/.github/workflows/milestone-worker.yml
@@ -8,8 +8,8 @@ on:
         required: true
 
 env:
-  MAVEN_THREADS: '-T 0.5C'
-
+  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -35,11 +35,11 @@ jobs:
     - uses: jfrog/setup-jfrog-cli@v4
       env:
         JF_URL: 'https://repo.spring.io'
-        JF_USER: ${{ secrets.ARTIFACTORY_USERNAME }}
-        JF_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+        JF_ACCESS_TOKEN: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Configure JFrog Cli
       run: |
-        jfrog config add repo.spring.io --url="https://repo.spring.io" --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD"  --interactive=false --overwrite=true        jfrog mvnc --use-wrapper \
+        jfrog config add repo.spring.io --url="https://repo.spring.io" --access-token="${{ secrets.JF_ARTIFACTORY_SPRING }}"  --interactive=false --overwrite=true
+        jfrog mvnc --use-wrapper \
           --server-id-resolve=repo.spring.io \
           --server-id-deploy=repo.spring.io \
           --repo-resolve-releases=milestone \

diff --git a/.github/workflows/next-dev-version-worker.yml b/.github/workflows/next-dev-version-worker.yml
@@ -8,7 +8,8 @@ on:
         required: true
 
 env:
-  MAVEN_THREADS: ''
+  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
 
 jobs:
   build:
@@ -35,11 +36,10 @@ jobs:
     - uses: jfrog/setup-jfrog-cli@v4
       env:
         JF_URL: 'https://repo.spring.io'
-        JF_USER: ${{ secrets.ARTIFACTORY_USERNAME }}
-        JF_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+        JF_ACCESS_TOKEN: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Configure JFrog Cli
       run: |
-        jfrog config add repo.spring.io --url="https://repo.spring.io" --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD"  --interactive=false --overwrite=true
+        jfrog config add repo.spring.io --url="https://repo.spring.io" --access-token="${{ secrets.JF_ARTIFACTORY_SPRING }}"  --interactive=false --overwrite=true
         jfrog mvnc --use-wrapper \
           --server-id-resolve=repo.spring.io \
           --server-id-deploy=repo.spring.io \

diff --git a/.github/workflows/promote-milestone.yml b/.github/workflows/promote-milestone.yml
@@ -29,8 +29,7 @@ jobs:
     - uses: jfrog/setup-jfrog-cli@v4
       env:
         JF_URL: 'https://repo.spring.io'
-        JF_USER: ${{ secrets.ARTIFACTORY_USERNAME }}
-        JF_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+        JF_ACCESS_TOKEN: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Promote Build
       run: |
         jfrog rt build-promote $BUILD_ZOO_HANDLER_spring_cloud_deployer_buildname $BUILD_ZOO_HANDLER_spring_cloud_deployer_buildnumber libs-milestone-local

diff --git a/.github/workflows/promote-release.yml b/.github/workflows/promote-release.yml
@@ -29,8 +29,7 @@ jobs:
     - uses: jfrog/setup-jfrog-cli@v4
       env:
         JF_URL: 'https://repo.spring.io'
-        JF_USER: ${{ secrets.ARTIFACTORY_USERNAME }}
-        JF_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+        JF_ACCESS_TOKEN: ${{ secrets.JF_ARTIFACTORY_SPRING }}
     - name: Promote Build
       run: |
         jfrog rt build-promote $BUILD_ZOO_HANDLER_spring_cloud_deployer_buildname $BUILD_ZOO_HANDLER_spring_cloud_deployer_buildnumber libs-release-local

diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -6,6 +6,9 @@ on:
       version:
         description: 'Version to publish'
         required: true
+env:
+  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
 
 jobs:
   build:
@@ -30,12 +33,11 @@ jobs:
       - uses: jfrog/setup-jfrog-cli@v4
         env:
           JF_URL: 'https://repo.spring.io'
-          JF_USER: ${{ secrets.ARTIFACTORY_USERNAME }}
-          JF_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          JF_ACCESS_TOKEN: ${{ secrets.JF_ARTIFACTORY_SPRING }}
 #       target deploy repos
       - name: Configure JFrog Cli
         run: |
-          jfrog config add repo.spring.io --url="https://repo.spring.io" --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD"  --interactive=false --overwrite=true
+          jfrog config add repo.spring.io --url="https://repo.spring.io" --access-token="${{ secrets.JF_ARTIFACTORY_SPRING }}"  --interactive=false --overwrite=true
           jfrog mvnc --use-wrapper \
             --server-id-resolve=repo.spring.io \
             --server-id-deploy=repo.spring.io \

diff --git a/.github/workflows/release-worker.yml b/.github/workflows/release-worker.yml
@@ -8,7 +8,8 @@ on:
         required: true
 
 env:
-  MAVEN_THREADS: '-T 1'
+  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
 
 jobs:
   build:
@@ -35,11 +36,10 @@ jobs:
       - uses: jfrog/setup-jfrog-cli@v4
         env:
           JF_URL: 'https://repo.spring.io'
-          JF_USER: ${{ secrets.ARTIFACTORY_USERNAME }}
-          JF_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          JF_ACCESS_TOKEN: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       - name: Configure JFrog Cli
         run: |
-          jfrog config add repo.spring.io --url="https://repo.spring.io" --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD"  --interactive=false --overwrite=true
+          jfrog config add repo.spring.io --url="https://repo.spring.io" --access-token="${{ secrets.JF_ARTIFACTORY_SPRING }}"  --interactive=false --overwrite=true
           jfrog mvnc --use-wrapper \
             --server-id-resolve=repo.spring.io \
             --server-id-deploy=repo.spring.io \
@@ -153,12 +153,7 @@ jobs:
     uses: ./.github/workflows/build-images.yml
     with:
       version: ${{ needs.build.outputs.version }}
-    secrets:
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-      GCR_JSON_KEY: ${{ secrets.GCR_JSON_KEY }}
-      ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-      ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+    secrets: inherit
   wrap:
     needs: [ build, images ]
     runs-on: ubuntu-latest

diff --git a/spring-cloud-dataflow-package/set-package-version.sh b/spring-cloud-dataflow-package/set-package-version.sh
@@ -3,14 +3,11 @@ if [ -z "$BASH_VERSION" ]; then
     echo "This script requires Bash. Use: bash $0 $*"
     exit 0
 fi
-if [ "$MVN" = "" ]; then
-    MVN=./mvnw
-fi
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 ROOT=$(realpath $SCDIR/..)
 if [ "$PACKAGE_VERSION" = "" ]; then
     pushd $ROOT > /dev/null
-    $MVN help:evaluate -s .settings.xml -Dexpression=project.version > /dev/null
+    ./mvnw help:evaluate -s .settings.xml -Dexpression=project.version > /dev/null
     PACKAGE_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
     popd > /dev/null
 fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,10 @@ on: @@
         branches:
           - main
+    env:
+      ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+      ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
     jobs:
       build:
@@ Expand Down @@