From f1e52f29c468bc382d87096e3e90066512c09e14 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Mon, 24 Aug 2026 11:37:20 +0530 Subject: [PATCH] RTECO-1884 - Remove unused external-JPD workflow_dispatch inputs from package e2e workflows The jfrog_url/jfrog_admin_token (and jfrog_user/jfrog_password in apkTests.yml) workflow_dispatch inputs let a suite skip local Artifactory install and point at an external JPD instead. Run history shows these were never actually supplied on any manual dispatch, so every suite always installed Artifactory locally in practice. Removing the dead inputs, their passthrough to install-local-artifactory, and the now-always-empty JFROG_TESTS_IS_EXTERNAL conditionals from the go test invocations. apkTests.yml also had these inputs declared twice (workflow_call and workflow_dispatch) while every other suite only declared them under workflow_dispatch - both are removed for consistency. Co-Authored-By: Claude Sonnet 5 --- .github/workflows/accessTests.yml | 13 ------ .github/workflows/apkTests.yml | 58 +------------------------- .github/workflows/artifactoryTests.yml | 14 ------- .github/workflows/conanTests.yml | 14 ------- .github/workflows/gradleTests.yml | 14 ------- .github/workflows/helmTests.yml | 13 ------ .github/workflows/huggingfaceTests.yml | 13 ------ .github/workflows/lifecycleTests.yml | 13 ------ .github/workflows/mavenTests.yml | 14 ------- .github/workflows/nixTests.yml | 14 ------- .github/workflows/npmTests.yml | 14 ------- .github/workflows/nugetTests.yml | 14 ------- .github/workflows/pluginsTests.yml | 14 ------- .github/workflows/pnpmTests.yml | 14 ------- .github/workflows/poetryTests.yml | 13 ------ .github/workflows/pythonTests.yml | 14 ------- .github/workflows/rubyTests.yml | 14 ------- .github/workflows/transferTests.yml | 16 ------- 18 files changed, 1 insertion(+), 292 deletions(-) diff --git a/.github/workflows/accessTests.yml b/.github/workflows/accessTests.yml index 3dab0e36e..010fea0ca 100644 --- a/.github/workflows/accessTests.yml +++ b/.github/workflows/accessTests.yml @@ -2,17 +2,6 @@ name: Access Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" permissions: id-token: write @@ -76,8 +65,6 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} - name: Get ID Token and Exchange Token diff --git a/.github/workflows/apkTests.yml b/.github/workflows/apkTests.yml index b5bb5311b..62cefb25d 100644 --- a/.github/workflows/apkTests.yml +++ b/.github/workflows/apkTests.yml @@ -1,49 +1,7 @@ name: Alpine APK Tests on: workflow_call: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" - jfrog_user: - description: "Username for external JFrog Platform." - type: string - required: false - default: "" - jfrog_password: - description: "Password for external JFrog Platform." - type: string - required: false - default: "" workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" - jfrog_user: - description: "Username for external JFrog Platform." - type: string - required: false - default: "" - jfrog_password: - description: "Password for external JFrog Platform." - type: string - required: false - default: "" jobs: Apk-Tests: @@ -80,7 +38,6 @@ jobs: uses: jfrog/.github/actions/install-go-with-cache@main - name: Install local Artifactory - if: inputs.jfrog_url == '' uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} @@ -100,24 +57,12 @@ jobs: - name: Run Alpine APK tests (alpine:${{ matrix.alpine-version }}) env: ALPINE_VER: ${{ matrix.alpine-version }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} - JFROG_USER: ${{ inputs.jfrog_user }} - JFROG_PASSWORD: ${{ inputs.jfrog_password }} MAX_ATTEMPTS: "3" RETRY_DELAY: "10" run: | set +e set -uo pipefail - # Build credential flags: external JPD (url + token) or empty for local Artifactory. - creds="" - if [ -n "$JFROG_URL" ]; then - creds="-jfrog.url=$JFROG_URL -jfrog.adminToken=$JFROG_ADMIN_TOKEN" - fi - [ -n "$JFROG_USER" ] && creds="$creds -jfrog.user=$JFROG_USER" - [ -n "$JFROG_PASSWORD" ] && creds="$creds -jfrog.password=$JFROG_PASSWORD" - run_regex="TestApk|TestSetupApk" fails="" for attempt in $(seq 1 "$MAX_ATTEMPTS"); do @@ -130,8 +75,7 @@ jobs: ./apk.test \ -test.v -test.timeout 0 \ -test.run "$run_regex" \ - -test.alpine \ - $creds 2>&1 | tee /tmp/apk-out.log + -test.alpine 2>&1 | tee /tmp/apk-out.log docker_exit=${PIPESTATUS[0]} # Collect the top-level names of tests that failed this attempt. diff --git a/.github/workflows/artifactoryTests.yml b/.github/workflows/artifactoryTests.yml index a9039e50d..fe131fb96 100644 --- a/.github/workflows/artifactoryTests.yml +++ b/.github/workflows/artifactoryTests.yml @@ -2,17 +2,6 @@ name: Artifactory Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" jobs: Artifactory-Tests: @@ -76,8 +65,6 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} - name: Run Artifactory tests @@ -92,4 +79,3 @@ jobs: run: >- go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.artifactoryProject --ci.runId=${{ runner.os }}-${{ matrix.suite }} - ${{ env.JFROG_TESTS_IS_EXTERNAL == 'true' && format('--jfrog.url={0} --jfrog.adminToken={1}', env.JFROG_TESTS_URL, env.JFROG_TESTS_LOCAL_ACCESS_TOKEN) || '' }} diff --git a/.github/workflows/conanTests.yml b/.github/workflows/conanTests.yml index 891e0d97d..9e361d977 100644 --- a/.github/workflows/conanTests.yml +++ b/.github/workflows/conanTests.yml @@ -2,17 +2,6 @@ name: Conan Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" jobs: Conan-Tests: @@ -65,12 +54,9 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: '1200' - name: Run Conan tests if: matrix.os.name != 'macos' run: >- go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.conan - ${{ env.JFROG_TESTS_IS_EXTERNAL == 'true' && format('--jfrog.url={0} --jfrog.adminToken={1}', env.JFROG_TESTS_URL, env.JFROG_TESTS_LOCAL_ACCESS_TOKEN) || '' }} diff --git a/.github/workflows/gradleTests.yml b/.github/workflows/gradleTests.yml index 2343f2611..7b1985f3b 100644 --- a/.github/workflows/gradleTests.yml +++ b/.github/workflows/gradleTests.yml @@ -2,17 +2,6 @@ name: Gradle Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" jobs: Gradle-Tests: @@ -89,12 +78,9 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} - name: Run Gradle tests if: matrix.os.name != 'macos' run: >- go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.gradle - ${{ env.JFROG_TESTS_IS_EXTERNAL == 'true' && format('--jfrog.url={0} --jfrog.adminToken={1}', env.JFROG_TESTS_URL, env.JFROG_TESTS_LOCAL_ACCESS_TOKEN) || '' }} diff --git a/.github/workflows/helmTests.yml b/.github/workflows/helmTests.yml index 9c7c8daa5..a3d665a31 100644 --- a/.github/workflows/helmTests.yml +++ b/.github/workflows/helmTests.yml @@ -2,17 +2,6 @@ name: Helm Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" permissions: id-token: write @@ -82,8 +71,6 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} - name: Get ID Token and Exchange Token diff --git a/.github/workflows/huggingfaceTests.yml b/.github/workflows/huggingfaceTests.yml index 8f1697cd7..a6989ba71 100644 --- a/.github/workflows/huggingfaceTests.yml +++ b/.github/workflows/huggingfaceTests.yml @@ -2,17 +2,6 @@ name: HuggingFace Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" permissions: id-token: write @@ -90,8 +79,6 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} - name: Get ID Token and Exchange Token diff --git a/.github/workflows/lifecycleTests.yml b/.github/workflows/lifecycleTests.yml index 339daf879..9636d93e5 100644 --- a/.github/workflows/lifecycleTests.yml +++ b/.github/workflows/lifecycleTests.yml @@ -4,17 +4,6 @@ env: on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" jobs: Lifecycle-Tests: @@ -75,8 +64,6 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} - name: Run Lifecycle tests diff --git a/.github/workflows/mavenTests.yml b/.github/workflows/mavenTests.yml index 63305f6a1..670b74aea 100644 --- a/.github/workflows/mavenTests.yml +++ b/.github/workflows/mavenTests.yml @@ -2,17 +2,6 @@ name: Maven Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" jobs: Maven-Tests: @@ -80,12 +69,9 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} - name: Run Maven tests if: matrix.os.name != 'macos' run: >- go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.maven - ${{ env.JFROG_TESTS_IS_EXTERNAL == 'true' && format('--jfrog.url={0} --jfrog.adminToken={1}', env.JFROG_TESTS_URL, env.JFROG_TESTS_LOCAL_ACCESS_TOKEN) || '' }} diff --git a/.github/workflows/nixTests.yml b/.github/workflows/nixTests.yml index 34a2d5f54..f7758d074 100644 --- a/.github/workflows/nixTests.yml +++ b/.github/workflows/nixTests.yml @@ -2,17 +2,6 @@ name: Nix Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" jobs: Nix-Tests: @@ -65,12 +54,9 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: '1200' - name: Run Nix tests if: matrix.os.name != 'macos' run: >- go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.nix - ${{ env.JFROG_TESTS_IS_EXTERNAL == 'true' && format('--jfrog.url={0} --jfrog.adminToken={1}', env.JFROG_TESTS_URL, env.JFROG_TESTS_LOCAL_ACCESS_TOKEN) || '' }} diff --git a/.github/workflows/npmTests.yml b/.github/workflows/npmTests.yml index a169b041b..9bf93b457 100644 --- a/.github/workflows/npmTests.yml +++ b/.github/workflows/npmTests.yml @@ -2,17 +2,6 @@ name: npm Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" jobs: npm-Tests: @@ -84,8 +73,6 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} - name: Run npm tests @@ -94,4 +81,3 @@ jobs: YARN_IGNORE_NODE: 1 run: >- go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.npm - ${{ env.JFROG_TESTS_IS_EXTERNAL == 'true' && format('--jfrog.url={0} --jfrog.adminToken={1}', env.JFROG_TESTS_URL, env.JFROG_TESTS_LOCAL_ACCESS_TOKEN) || '' }} diff --git a/.github/workflows/nugetTests.yml b/.github/workflows/nugetTests.yml index 3f52b488a..10efc72aa 100644 --- a/.github/workflows/nugetTests.yml +++ b/.github/workflows/nugetTests.yml @@ -3,17 +3,6 @@ name: NuGet Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" jobs: NuGet-Tests: @@ -102,12 +91,9 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} - name: Run NuGet tests if: matrix.os.name != 'macos' run: >- go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.nuget - ${{ env.JFROG_TESTS_IS_EXTERNAL == 'true' && format('--jfrog.url={0} --jfrog.adminToken={1}', env.JFROG_TESTS_URL, env.JFROG_TESTS_LOCAL_ACCESS_TOKEN) || '' }} diff --git a/.github/workflows/pluginsTests.yml b/.github/workflows/pluginsTests.yml index 19d5eaedd..288191710 100644 --- a/.github/workflows/pluginsTests.yml +++ b/.github/workflows/pluginsTests.yml @@ -2,17 +2,6 @@ name: Plugins Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" jobs: Plugins-Tests: @@ -73,12 +62,9 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} - name: Run plugins tests if: matrix.os.name != 'macos' run: >- go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.plugins - ${{ env.JFROG_TESTS_IS_EXTERNAL == 'true' && format('--jfrog.url={0} --jfrog.adminToken={1}', env.JFROG_TESTS_URL, env.JFROG_TESTS_LOCAL_ACCESS_TOKEN) || '' }} diff --git a/.github/workflows/pnpmTests.yml b/.github/workflows/pnpmTests.yml index a5b706f57..c6a2fae9c 100644 --- a/.github/workflows/pnpmTests.yml +++ b/.github/workflows/pnpmTests.yml @@ -2,17 +2,6 @@ name: pnpm Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" jobs: pnpm-Tests: @@ -84,8 +73,6 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} - name: Run pnpm tests @@ -94,4 +81,3 @@ jobs: YARN_IGNORE_NODE: 1 run: >- go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.pnpm - ${{ env.JFROG_TESTS_IS_EXTERNAL == 'true' && format('--jfrog.url={0} --jfrog.adminToken={1}', env.JFROG_TESTS_URL, env.JFROG_TESTS_LOCAL_ACCESS_TOKEN) || '' }} diff --git a/.github/workflows/poetryTests.yml b/.github/workflows/poetryTests.yml index a13eaa4a8..f3b1dd3a6 100644 --- a/.github/workflows/poetryTests.yml +++ b/.github/workflows/poetryTests.yml @@ -3,16 +3,6 @@ on: workflow_call: workflow_dispatch: inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" poetry_version: description: "Poetry version to install." type: string @@ -91,12 +81,9 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} - name: Run Poetry tests if: matrix.os.name != 'macos' run: >- go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.poetry - ${{ env.JFROG_TESTS_IS_EXTERNAL == 'true' && format('--jfrog.url={0} --jfrog.adminToken={1}', env.JFROG_TESTS_URL, env.JFROG_TESTS_LOCAL_ACCESS_TOKEN) || '' }} diff --git a/.github/workflows/pythonTests.yml b/.github/workflows/pythonTests.yml index 435269473..6d94561d7 100644 --- a/.github/workflows/pythonTests.yml +++ b/.github/workflows/pythonTests.yml @@ -2,17 +2,6 @@ name: Python Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" jobs: Python-Tests: @@ -89,12 +78,9 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} - name: Run Python tests if: matrix.os.name != 'macos' run: >- go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.${{ matrix.suite }} - ${{ env.JFROG_TESTS_IS_EXTERNAL == 'true' && format('--jfrog.url={0} --jfrog.adminToken={1}', env.JFROG_TESTS_URL, env.JFROG_TESTS_LOCAL_ACCESS_TOKEN) || '' }} diff --git a/.github/workflows/rubyTests.yml b/.github/workflows/rubyTests.yml index 1a45bd74d..da7b10fd1 100644 --- a/.github/workflows/rubyTests.yml +++ b/.github/workflows/rubyTests.yml @@ -2,17 +2,6 @@ name: Ruby Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" jobs: Ruby-Tests: @@ -62,12 +51,9 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} RT_CONNECTION_TIMEOUT_SECONDS: '1200' - name: Run Ruby tests if: matrix.os.name != 'macos' run: >- go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.ruby - ${{ env.JFROG_TESTS_IS_EXTERNAL == 'true' && format('--jfrog.url={0} --jfrog.adminToken={1}', env.JFROG_TESTS_URL, env.JFROG_TESTS_LOCAL_ACCESS_TOKEN) || '' }} diff --git a/.github/workflows/transferTests.yml b/.github/workflows/transferTests.yml index f74c7d8f0..a8ad5a244 100644 --- a/.github/workflows/transferTests.yml +++ b/.github/workflows/transferTests.yml @@ -2,17 +2,6 @@ name: Transfer Tests on: workflow_call: workflow_dispatch: - inputs: - jfrog_url: - description: "External JFrog Platform URL. Leave empty for local Artifactory." - type: string - required: false - default: "" - jfrog_admin_token: - description: "Admin token for external JFrog Platform." - type: string - required: false - default: "" jobs: Transfer-Artifactory-7-Tests: @@ -73,8 +62,6 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} JFROG_HOME: ${{ runner.temp }} RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} @@ -128,8 +115,6 @@ jobs: uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC_V6 }} - JFROG_URL: ${{ inputs.jfrog_url }} - JFROG_ADMIN_TOKEN: ${{ inputs.jfrog_admin_token }} JFROG_HOME: ${{ runner.temp }} VERSION: 6.23.21 RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }} @@ -141,4 +126,3 @@ jobs: --jfrog.targetAdminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.home=${{ runner.temp }} --ci.runId=${{ runner.os }}-transfer-6 - ${{ env.JFROG_TESTS_IS_EXTERNAL == 'true' && format('--jfrog.url={0} --jfrog.adminToken={1}', env.JFROG_TESTS_URL, env.JFROG_TESTS_LOCAL_ACCESS_TOKEN) || '' }}