Skip to content

RTECO-1884 - Inconsistent inputs from github workflows for packages e2e tests #3679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
naveenku-jfrog wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RTECO-1884 - Inconsistent inputs from github workflows for packages e2e tests #3679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .github/workflows/accessTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
58 changes: 1 addition & 57 deletions .github/workflows/apkTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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 }}
Expand All @@ -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
Expand All @@ -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.
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/artifactoryTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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) || '' }}
14 changes: 0 additions & 14 deletions .github/workflows/conanTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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) || '' }}
14 changes: 0 additions & 14 deletions .github/workflows/gradleTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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) || '' }}
13 changes: 0 additions & 13 deletions .github/workflows/helmTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/huggingfaceTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/lifecycleTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/mavenTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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) || '' }}
14 changes: 0 additions & 14 deletions .github/workflows/nixTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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) || '' }}
14 changes: 0 additions & 14 deletions .github/workflows/npmTests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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) || '' }}
Loading
Loading