Merge pull request #3791 from DataDog/robertomonteromiguel/onboarding…

…_and_k8s_lib_injection_update

.github/workflows/lib-injection.yml

@@ -52,8 +52,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
@@ -65,7 +65,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

.gitlab-ci.yml

@@ -10,7 +10,7 @@ stages:
 include:
   - remote: https://gitlab-templates.ddbuild.io/apm/packaging.yml
   - local: ".gitlab/benchmarks.yml"
-  - local: ".gitlab/onboarding_tests.yml"
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/single-step-instrumentation-tests.yml
 
 variables:
   DOWNSTREAM_BRANCH:
@@ -202,27 +202,19 @@ oci-internal-test-ecr-publish:
     IMG_REGISTRIES: agent-qa
 
 onboarding_tests:
-  extends: .base_job_onboarding_tests
+  extends: .base_job_onboarding
   stage: integration-tests
-  needs: [ package-amd64, package-arm64, oci-internal-test-ecr-publish]
+  needs: [ oci-internal-test-ecr-publish ]
   allow_failure: false
   variables:
     TEST_LIBRARY: ruby
-    ONBOARDING_FILTER_ENV: prod
+    SCENARIO: SIMPLE_INSTALLER_AUTO_INJECTION
+    DD_INSTALLER_LIBRARY_VERSION: pipeline-${CI_PIPELINE_ID}
   parallel:
       matrix:
-        - ONBOARDING_FILTER_WEBLOG: [test-app-ruby]
-          SCENARIO: [SIMPLE_HOST_AUTO_INJECTION]
-        - ONBOARDING_FILTER_WEBLOG: [test-app-ruby-container]
-          SCENARIO: [SIMPLE_CONTAINER_AUTO_INJECTION]
-        - ONBOARDING_FILTER_WEBLOG: [test-app-ruby,test-app-ruby-container]
-          SCENARIO: [INSTALLER_AUTO_INJECTION]
+        - ONBOARDING_FILTER_WEBLOG: [test-app-ruby, test-app-ruby-container]
   script:
     - git clone https://git@github.com/DataDog/system-tests.git system-tests
-    - cp packaging/*.rpm system-tests/binaries
-    - cp packaging/*.deb system-tests/binaries
-    - export DD_INSTALLER_LIBRARY_VERSION="pipeline-${CI_PIPELINE_ID}"
-    - ls system-tests/binaries
     - cd system-tests
     - ./build.sh -i runner
     - timeout 2700s ./run.sh $SCENARIO --vm-weblog ${ONBOARDING_FILTER_WEBLOG} --vm-env prod --vm-library ${TEST_LIBRARY} --vm-provider aws --vm-skip-branches ubuntu18_amd64