diff --git a/.github/workflows/pull_request_integration_tests.yml b/.github/workflows/pull_request_integration_tests.yml index d41c99eee4..7fdf0711f9 100644 --- a/.github/workflows/pull_request_integration_tests.yml +++ b/.github/workflows/pull_request_integration_tests.yml @@ -22,6 +22,10 @@ on: description: "Git ref (commit, branch, or tag) to check out" required: false type: string + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: + description: "Docker Hub token for pulling images (optional)" + required: false concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -113,8 +117,19 @@ jobs: ref: ${{ inputs.ref || github.sha }} persist-credentials: false + - name: Check for Docker Hub token + id: check-docker-token + run: | + if [ -n "${DOCKER_TOKEN}" ]; then + echo "has_token=true" >> "$GITHUB_OUTPUT" + else + echo "has_token=false" >> "$GITHUB_OUTPUT" + fi + env: + DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION }} + - name: Log in to Docker Hub - if: secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION != '' + if: steps.check-docker-token.outputs.has_token == 'true' uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 with: username: ${{ vars.DOCKER_USERNAME }} diff --git a/.github/workflows/pull_request_integration_tests_arm.yml b/.github/workflows/pull_request_integration_tests_arm.yml index fdfa2f915a..eefb65a379 100644 --- a/.github/workflows/pull_request_integration_tests_arm.yml +++ b/.github/workflows/pull_request_integration_tests_arm.yml @@ -22,6 +22,10 @@ on: description: "Git ref (commit, branch, or tag) to check out" required: false type: string + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: + description: "Docker Hub token for pulling images (optional)" + required: false concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -119,8 +123,19 @@ jobs: ref: ${{ inputs.ref || github.sha }} persist-credentials: false + - name: Check for Docker Hub token + id: check-docker-token + run: | + if [ -n "${DOCKER_TOKEN}" ]; then + echo "has_token=true" >> "$GITHUB_OUTPUT" + else + echo "has_token=false" >> "$GITHUB_OUTPUT" + fi + env: + DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION }} + - name: Log in to Docker Hub - if: secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION != '' + if: steps.check-docker-token.outputs.has_token == 'true' uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 with: username: ${{ vars.DOCKER_USERNAME }} diff --git a/.github/workflows/pull_request_k8s_integration_tests.yml b/.github/workflows/pull_request_k8s_integration_tests.yml index eb4c8ded7a..f5a6bdedb0 100644 --- a/.github/workflows/pull_request_k8s_integration_tests.yml +++ b/.github/workflows/pull_request_k8s_integration_tests.yml @@ -22,6 +22,10 @@ on: description: "Git ref (commit, branch, or tag) to check out" required: false type: string + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: + description: "Docker Hub token for pulling images (optional)" + required: false concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -111,8 +115,19 @@ jobs: ref: ${{ inputs.ref || github.sha }} persist-credentials: false + - name: Check for Docker Hub token + id: check-docker-token + run: | + if [ -n "${DOCKER_TOKEN}" ]; then + echo "has_token=true" >> "$GITHUB_OUTPUT" + else + echo "has_token=false" >> "$GITHUB_OUTPUT" + fi + env: + DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION }} + - name: Log in to Docker Hub - if: secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION != '' + if: steps.check-docker-token.outputs.has_token == 'true' uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 with: username: ${{ vars.DOCKER_USERNAME }} diff --git a/.github/workflows/pull_request_oats_test.yml b/.github/workflows/pull_request_oats_test.yml index cf509f6ec4..0e33e3d092 100644 --- a/.github/workflows/pull_request_oats_test.yml +++ b/.github/workflows/pull_request_oats_test.yml @@ -22,6 +22,10 @@ on: description: "Git ref (commit, branch, or tag) to check out" required: false type: string + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: + description: "Docker Hub token for pulling images (optional)" + required: false concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -111,8 +115,19 @@ jobs: ref: ${{ inputs.ref || github.sha }} persist-credentials: false + - name: Check for Docker Hub token + id: check-docker-token + run: | + if [ -n "${DOCKER_TOKEN}" ]; then + echo "has_token=true" >> "$GITHUB_OUTPUT" + else + echo "has_token=false" >> "$GITHUB_OUTPUT" + fi + env: + DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION }} + - name: Log in to Docker Hub - if: secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION != '' + if: steps.check-docker-token.outputs.has_token == 'true' uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 with: username: ${{ vars.DOCKER_USERNAME }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2c0ec8dff4..84db4e7389 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -114,6 +114,8 @@ jobs: checks: write pull-requests: write actions: write + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: ${{ secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION }} with: ref: ${{ inputs.tag || github.ref_name }} @@ -126,6 +128,8 @@ jobs: checks: write pull-requests: write actions: write + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: ${{ secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION }} with: ref: ${{ inputs.tag || github.ref_name }} @@ -138,6 +142,8 @@ jobs: checks: write pull-requests: write actions: write + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: ${{ secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION }} with: ref: ${{ inputs.tag || github.ref_name }} @@ -150,6 +156,8 @@ jobs: checks: write pull-requests: write actions: write + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: ${{ secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION }} with: ref: ${{ inputs.tag || github.ref_name }} @@ -189,6 +197,8 @@ jobs: checks: write pull-requests: write actions: write + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: ${{ secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION }} with: ref: ${{ inputs.tag || github.ref_name }} diff --git a/.github/workflows/workflow_integration_tests_vm.yml b/.github/workflows/workflow_integration_tests_vm.yml index 2ad0ae844c..97627e4b56 100644 --- a/.github/workflows/workflow_integration_tests_vm.yml +++ b/.github/workflows/workflow_integration_tests_vm.yml @@ -17,6 +17,10 @@ on: description: "Git ref (commit, branch, or tag) to check out" required: false type: string + secrets: + DOCKER_TOKEN_EBPF_INSTRUMENTATION: + description: "Docker Hub token for pulling images (optional)" + required: false concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -121,8 +125,19 @@ jobs: ref: ${{ inputs.ref || github.sha }} persist-credentials: false + - name: Check for Docker Hub token + id: check-docker-token + run: | + if [ -n "${DOCKER_TOKEN}" ]; then + echo "has_token=true" >> "$GITHUB_OUTPUT" + else + echo "has_token=false" >> "$GITHUB_OUTPUT" + fi + env: + DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION }} + - name: Log in to Docker Hub - if: secrets.DOCKER_TOKEN_EBPF_INSTRUMENTATION != '' + if: steps.check-docker-token.outputs.has_token == 'true' uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 with: username: ${{ vars.DOCKER_USERNAME }} diff --git a/internal/test/oats/kafka/docker-compose-obi-java-kafka.yml b/internal/test/oats/kafka/docker-compose-obi-java-kafka.yml index f5005a2b34..35e63032d9 100644 --- a/internal/test/oats/kafka/docker-compose-obi-java-kafka.yml +++ b/internal/test/oats/kafka/docker-compose-obi-java-kafka.yml @@ -8,7 +8,7 @@ services: - "2181:2181" kafka: - image: confluentinc/cp-kafka:8.2.0@sha256:acbbf674f2ed40e5d0a8ca51beb0f00692c866fc22b5ce06f8cadbdc54cd4436 + image: confluentinc/cp-kafka:7.9.5@sha256:c4c6b755551da17fff056b9c8b39700f99020083bd2d69a171ece4784f33e640 depends_on: - zookeeper environment: