From eb5c901141b57bfddd963ded1febe11294581aba Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Wed, 7 Dec 2022 17:33:15 -0600 Subject: [PATCH] [GitHub Actions] Use ORG secret for artifactory --- .github/workflows/ci-2021-0-x.yml | 6 ++--- .github/workflows/ci-2021-1-x.yml | 4 ++-- .github/workflows/ci-main.yml | 4 ++-- .github/workflows/common.yml | 24 +++++++++---------- .settings.xml | 6 ++--- .../stream-applications-core/.settings.xml | 4 ++-- build-app.sh | 4 ++-- build-folder.sh | 4 ++-- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci-2021-0-x.yml b/.github/workflows/ci-2021-0-x.yml index 1b5107f2..7da5d668 100644 --- a/.github/workflows/ci-2021-0-x.yml +++ b/.github/workflows/ci-2021-0-x.yml @@ -15,8 +15,8 @@ jobs: DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }} TMC_API_TOKEN: ${{ secrets.TMC_API_TOKEN }} GCP_CRED_JSON: ${{ secrets.GCP_CRED_JSON }} - CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} - CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} + ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} with: branch: '2021.0.x' - verbose: ${{ inputs.verbose == 'true' }} \ No newline at end of file + verbose: ${{ inputs.verbose == 'true' }} diff --git a/.github/workflows/ci-2021-1-x.yml b/.github/workflows/ci-2021-1-x.yml index b0407475..7ab7cc83 100644 --- a/.github/workflows/ci-2021-1-x.yml +++ b/.github/workflows/ci-2021-1-x.yml @@ -15,8 +15,8 @@ jobs: DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }} TMC_API_TOKEN: ${{ secrets.TMC_API_TOKEN }} GCP_CRED_JSON: ${{ secrets.GCP_CRED_JSON }} - CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} - CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} + ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} with: branch: '2021.1.x' verbose: ${{ inputs.verbose == 'true' }} diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index da3535c3..7f4be191 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -16,8 +16,8 @@ jobs: DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }} TMC_API_TOKEN: ${{ secrets.TMC_API_TOKEN }} GCP_CRED_JSON: ${{ secrets.GCP_CRED_JSON }} - CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} - CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} + ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} with: branch: 'main' verbose: ${{ inputs.verbose == 'true' }} diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index 570ba8a4..c724ab38 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -23,8 +23,8 @@ on: DOCKER_HUB_PASSWORD: TMC_API_TOKEN: GCP_CRED_JSON: - CI_DEPLOY_USERNAME: - CI_DEPLOY_PASSWORD: + ARTIFACTORY_USERNAME: + ARTIFACTORY_PASSWORD: GH_ARC_APP_ID: GH_ARC_INSTALLATION_ID: GH_ARC_PRIVATE_KEY: @@ -204,8 +204,8 @@ jobs: - name: 'Action: build initial dependencies' shell: bash env: - CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} - CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} + ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} MAVEN_THREADS: ${{ inputs.useMavenThreads }} run: | ROOT_DIR=$(realpath $PWD) @@ -300,8 +300,8 @@ jobs: - name: 'Build: ${{ matrix.app }}' shell: bash env: - CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} - CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} + ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }} MAVEN_THREADS: ${{ inputs.useMavenThreads }} run: ./build-app.sh "stream-applications" "applications/processor/${{ matrix.app }}" @@ -379,8 +379,8 @@ jobs: - name: 'Build: ${{ matrix.app }}' shell: bash env: - CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} - CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} + ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }} MAVEN_THREADS: ${{ inputs.useMavenThreads }} run: ./build-app.sh "stream-applications" "applications/sink/${{ matrix.app }}" @@ -459,8 +459,8 @@ jobs: - name: 'Build: ${{ matrix.app }}' shell: bash env: - CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} - CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} + ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }} MAVEN_THREADS: ${{ inputs.useMavenThreads }} run: ./build-app.sh "stream-applications" "applications/source/${{ matrix.app }}" @@ -526,8 +526,8 @@ jobs: - name: 'Build: stream-applications-release-train' shell: bash env: - CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} - CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} + ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }} MAVEN_THREADS: ${{ inputs.useMavenThreads }} run: | diff --git a/.settings.xml b/.settings.xml index 8f7113eb..2e1e52b4 100644 --- a/.settings.xml +++ b/.settings.xml @@ -3,8 +3,8 @@ repo.spring.io - ${env.CI_DEPLOY_USERNAME} - ${env.CI_DEPLOY_PASSWORD} + ${env.ARTIFACTORY_USERNAME} + ${env.ARTIFACTORY_PASSWORD} @@ -67,4 +67,4 @@ - \ No newline at end of file + diff --git a/applications/stream-applications-core/.settings.xml b/applications/stream-applications-core/.settings.xml index 9f3eacf9..27af6575 100644 --- a/applications/stream-applications-core/.settings.xml +++ b/applications/stream-applications-core/.settings.xml @@ -3,8 +3,8 @@ repo.spring.io - ${env.CI_DEPLOY_USERNAME} - ${env.CI_DEPLOY_PASSWORD} + ${env.ARTIFACTORY_USERNAME} + ${env.ARTIFACTORY_PASSWORD} diff --git a/build-app.sh b/build-app.sh index d6128570..214628ee 100755 --- a/build-app.sh +++ b/build-app.sh @@ -25,8 +25,8 @@ PROJECT_FOLDER=$(realpath "$1") APP_FOLDER=$2 set -e -check_env CI_DEPLOY_USERNAME -check_env CI_DEPLOY_PASSWORD +check_env ARTIFACTORY_USERNAME +check_env ARTIFACTORY_PASSWORD pushd "$PROJECT_FOLDER" > /dev/null if [ "$VERBOSE" == "true" ]; then diff --git a/build-folder.sh b/build-folder.sh index 87f510de..97c47071 100755 --- a/build-folder.sh +++ b/build-folder.sh @@ -56,8 +56,8 @@ done # IFS will affect mvnw ability to split arguments. IFS=$SAVED_IFS if [[ "$MAVEN_GOAL" == *"deploy"* ]]; then - check_env CI_DEPLOY_USERNAME - check_env CI_DEPLOY_PASSWORD + check_env ARTIFACTORY_USERNAME + check_env ARTIFACTORY_PASSWORD fi RETRIES=3