From 1f37a23a00f99962e84a5eb9880646358d1122e8 Mon Sep 17 00:00:00 2001
From: Tony Hsu <tony.hsu@datadoghq.com>
Date: Fri, 30 Aug 2024 11:36:49 +0200
Subject: [PATCH 1/2] Disable persist-credentials when checking out system
 tests

---
 .github/workflows/lib-injection.yml | 4 +++-
 .github/workflows/system-tests.yml  | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lib-injection.yml b/.github/workflows/lib-injection.yml
index 95df541751f..332a39be93e 100644
--- a/.github/workflows/lib-injection.yml
+++ b/.github/workflows/lib-injection.yml
@@ -58,9 +58,10 @@ jobs:
       uses: actions/checkout@v4
       with:
           repository: 'DataDog/system-tests'
+          persist-credentials: false
 
     - name: Install runner
-      uses: ./.github/actions/install_runner 
+      uses: ./.github/actions/install_runner
 
     - name: Run K8s Lib Injection Tests
       run: ./run.sh K8S_LIB_INJECTION_BASIC
@@ -91,6 +92,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: DataDog/system-tests
+          persist-credentials: false
           path: system-tests
       - name: Overwrite auto inject script with commit SHA
         run: |
diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
index c4ce4e5014d..c6dbf3b672a 100644
--- a/.github/workflows/system-tests.yml
+++ b/.github/workflows/system-tests.yml
@@ -31,6 +31,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'DataDog/system-tests'
+          persist-credentials: false
       - name: Pull released image
         run: |
           if docker pull ${{ env.REPO }}/system-tests/${{ matrix.image.name }}:latest; then
@@ -104,6 +105,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'DataDog/system-tests'
+          persist-credentials: false
       - name: Checkout ${{ matrix.library.repository }}
         uses: actions/checkout@v4
         with:
@@ -250,6 +252,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'DataDog/system-tests'
+          persist-credentials: false
       - name: Pull runner image
         run: |
           docker pull ${{ env.REPO }}/system-tests/runner:gha${{ github.run_id }}-g${{ github.sha }}
@@ -316,6 +319,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'DataDog/system-tests'
+          persist-credentials: false
       - name: Retrieve logs
         uses: actions/download-artifact@v4
         with:

From abc8342d906d505f70768d44048f63a955a7b369 Mon Sep 17 00:00:00 2001
From: Tony Hsu <tony.hsu@datadoghq.com>
Date: Mon, 2 Sep 2024 11:59:11 +0200
Subject: [PATCH 2/2] Backport lib injection test

---
 .github/workflows/lib-injection.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lib-injection.yml b/.github/workflows/lib-injection.yml
index 332a39be93e..01acdad3551 100644
--- a/.github/workflows/lib-injection.yml
+++ b/.github/workflows/lib-injection.yml
@@ -50,8 +50,8 @@ jobs:
     env:
       TEST_LIBRARY: ruby
       WEBLOG_VARIANT: ${{ matrix.weblog-variant }}
-      DOCKER_REGISTRY_IMAGES_PATH: ghcr.io/datadog
-      DOCKER_IMAGE_TAG: ${{ github.sha }}
+      LIB_INIT_IMAGE: ghcr.io/datadog/dd-trace-rb/dd-lib-ruby-init:${{ github.sha }}
+      LIBRARY_INJECTION_TEST_APP_IMAGE: ghcr.io/datadog/system-tests/${{ matrix.weblog-variant }}:latest
       BUILDX_PLATFORMS: linux/amd64,linux/arm64/v8
     steps:
     - name: Checkout system tests
@@ -64,7 +64,7 @@ jobs:
       uses: ./.github/actions/install_runner
 
     - name: Run K8s Lib Injection Tests
-      run: ./run.sh K8S_LIB_INJECTION_BASIC
+      run: ./run.sh K8S_LIBRARY_INJECTION_BASIC
 
     - name: Compress logs
       id: compress_logs