From 32431c569e3680a7d5cd905a942e15c71fa42a52 Mon Sep 17 00:00:00 2001 From: Jesse Houldsworth Date: Tue, 29 Apr 2025 07:33:02 -0700 Subject: [PATCH] switching to soleng --- .github/workflows/ci-pipeline.yml | 12 ++++++------ .github/workflows/frogbot-scan-pull-request.yml | 8 ++++---- .github/workflows/frogbot-scan-repository.yml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index f0e19ee36..79c4cd493 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -37,8 +37,8 @@ jobs: id: setup-cli env: JF_URL: ${{secrets.JF_RT_URL}} # Artifactory base URL (stored as a GitHub secret) - JFROG_CLI_RELEASES_REPO: 'https://trialt0zppb.jfrog.io/artifactory/petclinic-maven-dev-virtual/' - JFROG_CLI_EXTRACTORS_REMOTE: 'https://trialt0zppb.jfrog.io/artifactory/petclinic-maven-dev-virtual/' + JFROG_CLI_RELEASES_REPO: 'https://soleng.jfrog.io/artifactory/jesseh-maven-dev-virtual/' + JFROG_CLI_EXTRACTORS_REMOTE: 'https://soleng.jfrog.io/artifactory/jesseh-maven-dev-virtual/' JF_GIT_TOKEN: ${{secrets.GH_TOKEN}} # GitHub token for authentication JF_USER: ${{secrets.ARTIFACTORY_USERNAME}} # Artifactory username JF_PASSWORD: ${{secrets.ARTIFACTORY_IDENTITY_TOKEN}} # Artifactory identity token @@ -62,7 +62,7 @@ jobs: # 6) Configure Maven to use JFrog as a repository ################################################# - name: configure maven - run: jf mvnc --global --repo-resolve-releases petclinic-maven-dev-virtual/ --repo-resolve-snapshots petclinic-maven-dev-virtual/ + run: jf mvnc --global --repo-resolve-releases jesseh-maven-dev-virtual/ --repo-resolve-snapshots jesseh-maven-dev-virtual/ # This sets up JFrog CLI to resolve dependencies from Artifactory ################################################# @@ -89,7 +89,7 @@ jobs: ################################################# - name: Build Docker Image run: | - docker build -t trialt0zppb.jfrog.io/petclinic-docker-dev-local/spring-petclinic:${{ github.run_id }} . + docker build -t jesseh.jfrog.io/jesseh-docker-dev-local/spring-petclinic:${{ github.run_id }} . ################################################# # 10) Push Docker image using JFrog CLI @@ -97,8 +97,8 @@ jobs: - name: Push Docker Image to Artifactory run: | jfrog rt docker-push \ - trialt0zppb.jfrog.io/petclinic-docker-dev-local/spring-petclinic:${{ github.run_id }} \ - petclinic-docker-dev-local \ + jesseh.jfrog.io/jesseh-docker-dev-local/spring-petclinic:${{ github.run_id }} \ + jesseh-docker-dev-local \ --build-name="spring-petclinic" \ --build-number="${{ github.run_id }}" diff --git a/.github/workflows/frogbot-scan-pull-request.yml b/.github/workflows/frogbot-scan-pull-request.yml index 61c9d7c72..78863ab25 100644 --- a/.github/workflows/frogbot-scan-pull-request.yml +++ b/.github/workflows/frogbot-scan-pull-request.yml @@ -18,19 +18,19 @@ jobs: env: # [Mandatory] # JFrog platform URL - JF_URL: ${{ secrets.JF_URL }} + JF_URL: ${{ secrets.JF_RT_URL }} # [Mandatory if JF_USER and JF_PASSWORD are not provided] # JFrog access token with 'read' permissions on Xray service - # JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }} + # JF_ACCESS_TOKEN: # [Mandatory if JF_ACCESS_TOKEN is not provided] # JFrog username with 'read' permissions for Xray. Must be provided with JF_PASSWORD - JF_USER: ${{ secrets.JF_USER }} + JF_USER: ${{ secrets.ARTIFACTORY_USERNAME }} # [Mandatory if JF_ACCESS_TOKEN is not provided] # JFrog password. Must be provided with JF_USER - JF_PASSWORD: ${{ secrets.JF_ACCESS_TOKEN }} + JF_PASSWORD: ${{ secrets.ARTIFACTORY_IDENTITY_TOKEN }} # [Mandatory] # The GitHub token is automatically generated for the job diff --git a/.github/workflows/frogbot-scan-repository.yml b/.github/workflows/frogbot-scan-repository.yml index 6ab782483..127f53902 100644 --- a/.github/workflows/frogbot-scan-repository.yml +++ b/.github/workflows/frogbot-scan-repository.yml @@ -25,7 +25,7 @@ jobs: env: # [Mandatory] # JFrog platform URL - JF_URL: ${{ secrets.JF_URL }} + JF_URL: ${{ secrets.JF_RT_URL }} # [Mandatory if JF_USER and JF_PASSWORD are not provided] # JFrog access token with 'read' permissions on Xray service