Remove free tier usage from tests
@@ -67,14 +67,9 @@ jobs:
if: ${{ ( matrix.suite == 'pip'|| matrix.suite == 'xray' ) && ( matrix.suite == 'ubuntu-latest' || matrix.suite == 'macos-latest' ) }}
run: source venv/bin/activate
- - name: Run tests on ecosys
- if: ${{ matrix.suite == 'distribution' || matrix.suite == 'plugins' || matrix.suite == 'artifactoryProject' }}
+ - name: Run tests
run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.${{ matrix.suite }}=true --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --ci.runId=${{ runner.os }}-${{ matrix.suite }}
- - name: Run tests in free tier
- if: ${{ matrix.suite == 'artifactory' || matrix.suite == 'pip' || matrix.suite == 'xray' || matrix.suite == 'npm' || matrix.suite == 'maven' || matrix.suite == 'gradle' || matrix.suite == 'nuget' || matrix.suite == 'go' }}
- run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.${{ matrix.suite }}=true --jfrog.url=${{ secrets.PLATFORM_URL_FREE_TIER }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN_FREE_TIER }} --jfrog.user=${{ secrets.PLATFORM_USER_FREE_TIER }} --ci.runId=${{ runner.os }}-${{ matrix.suite }}
-
Docker-tests:
if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
runs-on: ubuntu-latest
@@ -88,4 +83,4 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Run Docker tests
- run: go test -v -timeout 0 --test.docker=true --jfrog.url=${{ secrets.PLATFORM_URL_FREE_TIER }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN_FREE_TIER }} --rt.dockerRepoDomain=ecosysjfrogb.jfrog.io/docker-virtual --rt.dockerVirtualRepo=docker-virtual --rt.DockerLocalRepo=docker-local --rt.dockerRemoteRepo=docker-remote
\ No newline at end of file
+ run: go test -v -timeout 0 --test.docker=true --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --rt.dockerRepoDomain=ecosysjfrog-docker-virtual.jfrog.io --rt.dockerVirtualRepo=docker-virtual --rt.DockerLocalRepo=docker-local --rt.dockerRemoteRepo=docker-remote
\ No newline at end of file
