Change integration tests

Author: EyalDelarea

.github/workflows/oidc-integration-test.yml

@@ -13,91 +13,69 @@ permissions:
   id-token: write
   contents: read
 
+env:
+  JFROG_CLI_LOG_LEVEL: DEBUG
+
 jobs:
-  setup-artifactory:
-    runs-on: ubuntu-latest
-    outputs:
-      jf_url: http://localhost:8081/
-      oidc_provider_name: ${{ steps.generate-oidc-name.outputs.oidc_provider_name }}
+  oidc-test:
+    if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu, macos, windows]
+        cli-version: ['2.74.1', '2.75.0']
+    runs-on: ${{ matrix.os }}-latest
+    name: OIDC Test - ${{ matrix.cli-version }} on ${{ matrix.os }}
 
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
-
-      - name: Setup Go with cache
-        uses: jfrog/.github/actions/install-go-with-cache@main
-
-      - name: Install local Artifactory
-        uses: jfrog/.github/actions/install-local-artifactory@main
         with:
-          RTLIC: ${{ secrets.RTLIC }}
-
-      - name: Wait for Artifactory to be ready
-        shell: bash
-        run: |
-          until curl -sSf http://localhost:8081/artifactory/api/system/ping; do sleep 5; done
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Generate unique OIDC provider name
-        id: generate-oidc-name
+        id: gen-oidc
         shell: bash
-        run: echo "oidc_provider_name=oidc-integration-$(date +%s)" >> "$GITHUB_OUTPUT"
+        run: echo "oidc_provider_name=oidc-integration-${{ matrix.cli-version }}-${{ matrix.os }}-$(date +%s)" >> "$GITHUB_OUTPUT"
 
       - name: Create OpenID Connect integration
         shell: bash
         run: |
-          curl -X POST "${{ secrets.JFROG_PLATFORM_URL }}/access/api/v1/oidc" \
-            -H "Content-Type: application/json" \
-            -H "Authorization: Bearer ${{ secrets.JFROG_PLATFORM_RT_TOKEN }}" \
-            -d '{
-              "name": "${{ steps.generate-oidc-name.outputs.oidc_provider_name }}",
-              "issuer_url": "https://token.actions.githubusercontent.com",
-              "provider_type": "GitHub",
-              "enable_permissive_configuration": "true",
-              "description": "Test configuration for OIDC integration"
-            }'
+          curl -X POST "${{ secrets.JFROG_PLATFORM_URL }}/access/api/v1/oidc" -H "Content-Type: application/json" -H "Authorization: Bearer ${{ secrets.JFROG_PLATFORM_RT_TOKEN }}" -d '{
+            "name": "${{ steps.gen-oidc.outputs.oidc_provider_name }}",
+            "issuer_url": "https://token.actions.githubusercontent.com",
+            "provider_type": "GitHub",
+            "enable_permissive_configuration": "true",
+            "description": "Test configuration for CLI version ${{ matrix.cli-version }}"
+          }'
 
       - name: Create OIDC Identity Mapping
         shell: bash
         run: |
-          curl -X POST "${{ secrets.JFROG_PLATFORM_URL }}/access/api/v1/oidc/${{ steps.generate-oidc-name.outputs.oidc_provider_name }}/identity_mappings" \
-            -H 'Content-Type: application/json' \
-            -H "Authorization: Bearer ${{ secrets.JFROG_PLATFORM_RT_TOKEN }}" \
-            -d '{
-              "name": "oidc-test-mapping",
-              "priority": "1",
-              "claims": {
-                "repository": "${{ github.repository_owner }}/setup-jfrog-cli"
-              },
-              "token_spec": {
-                "scope": "applied-permissions/groups:readers",
-                "expires_in": 30
-              }
-            }'
+          curl -X POST "${{ secrets.JFROG_PLATFORM_URL }}/access/api/v1/oidc/${{ steps.gen-oidc.outputs.oidc_provider_name }}/identity_mappings" \
+          -H 'Content-Type: application/json' \
+          -H 'Authorization: Bearer ${{ secrets.JFROG_PLATFORM_RT_TOKEN }}' \
+          -d '{
+            "name": "oidc-test-mapping",
+            "priority": "1",
+            "claims": {
+              "repository": "${{ github.repository_owner }}/setup-jfrog-cli"
+            },
+            "token_spec": {
+              "scope": "applied-permissions/groups:readers",
+              "expires_in": 30
+            }
+          }'
 
-  oidc-test:
-    needs: setup-artifactory
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu, macos, windows]
-        cli-version: ['2.74.1', '2.75.0', 'latest']
-    runs-on: ${{ matrix.os }}-latest
-    name: OIDC Test - ${{ matrix.cli-version }} on ${{ matrix.os }}
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Setup JFrog CLI
         id: setup-jfrog-cli
         uses: ./
         env:
-          JF_URL: ${{ needs.setup-artifactory.outputs.jf_url }}
+          JF_URL: ${{ secrets.JFROG_PLATFORM_URL }}
         with:
           version: ${{ matrix.cli-version }}
-          oidc-provider-name: ${{ needs.setup-artifactory.outputs.oidc_provider_name }}
+          oidc-provider-name: ${{ steps.gen-oidc.outputs.oidc_provider_name }}
 
       - name: Test JFrog CLI connectivity
         run: jf rt ping
@@ -114,5 +92,5 @@ jobs:
         shell: bash
         if: always()
         run: |
-          curl -X DELETE "${{ secrets.JFROG_PLATFORM_URL }}/access/api/v1/oidc/${{ needs.setup-artifactory.outputs.oidc_provider_name }}" \
-            -H "Authorization: Bearer ${{ secrets.JFROG_PLATFORM_RT_TOKEN }}"
+          curl -X DELETE "${{ secrets.JFROG_PLATFORM_URL }}/access/api/v1/oidc/${{ steps.gen-oidc.outputs.oidc_provider_name }}" \
+          -H "Authorization: Bearer ${{ secrets.JFROG_PLATFORM_RT_TOKEN }}"