Merge pull request #4366 from DataDog/lloeki/ssi

Improve SSI

Author: TonyCTHsu

.gitlab-ci.yml

@@ -32,7 +32,7 @@ default:
   parallel:
     matrix:
       # ADD NEW RUBIES HERE
-      - RUBY_VERSION: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
+      - RUBY_VERSION: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
   script:
     - >
       docker build
@@ -67,7 +67,7 @@ promote-image:
   parallel:
     matrix:
       # ADD NEW RUBIES HERE
-      - RUBY_VERSION: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7"]
+      - RUBY_VERSION: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
         ARCHITECTURE: ["amd64", "arm64"]
   script:
     - docker pull $RUBY_CUSTOM_IMAGE_BASE/$RUBY_VERSION-$ARCHITECTURE:$CI_PIPELINE_ID
@@ -105,8 +105,7 @@ install-dependencies:
   tags: ["arch:$ARCH"]
   parallel:
     matrix:
-      # Promote again when adding 3.4 support
-      - RUBY_VERSION: ["3.3", "3.2", "3.1", "3.0", "2.7"]
+      - RUBY_VERSION: ["3.4", "3.3", "3.2", "3.1", "3.0", "2.7", "2.6"]
         ARCH: ["amd64", "arm64"]
   stage: package
   needs:
@@ -181,7 +180,7 @@ vaccine:
 
   script:
     - export GITHUB_TOKEN=$(cat token.txt)
-    - .gitlab/scripts/vaccine.sh master "${CI_COMMIT_SHA}" "glci:${CI_PIPELINE_ID}"
+    - .gitlab/scripts/vaccine.sh lloeki/ssi "${CI_COMMIT_SHA}" "glci:${CI_PIPELINE_ID}"
 
   after_script:
     # Revoke the token after usage

.gitlab/Dockerfile-2.6

@@ -0,0 +1 @@
+FROM ghcr.io/datadog/images-rb/engines/ruby:2.6-centos-gcc

.gitlab/prepare-oci-package.sh

@@ -1,20 +1,45 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-set -e
+## This script is called by `package-oci` in `one-pipeline.yml`
 
-if [ "$OS" != "linux" ]; then
+set -euo pipefail
+
+## Early checks
+
+if [[ "$OS" != "linux" ]]; then
   echo "Only linux packages are supported. Exiting"
   exit 0
 fi
 
+## Obtain injector source
+
+injector_repo="https://github.com/DataDog/datadog-injector-rb.git"
+injector_ref="v1.0.0"
+injector_path="${HOME}/datadog-injector-rb"
+
+git clone "${injector_repo}" --branch "${injector_ref}" "${injector_path}"
+
+## Prepare package structure as expected by shared pipeline
+
 mkdir sources
 
-cp ../lib-injection/host_inject.rb sources
-cp ../lib-injection/host_inject_main.rb sources
+# Copy injector runtime source
+cp -Rv "${injector_path}/src"/* sources
+
+# host injection expects a specific name
+ln -rs sources/injector.rb sources/host_inject.rb
+
+# Kubernetes injection expects a specific name
+ln -rs sources/injector.rb sources/auto_inject.rb
+
+## Copy system injector rules
+
 cp ../lib-injection/requirements.json sources/requirements.json
-# Kubernetes injection expects a different path
-ln -rs sources/host_inject.rb sources/auto_inject.rb
 
-cp -r ../tmp/${ARCH}/* sources
+## Copy arch-specific content, a.k.a per-version `GEM_HOME`
+
+cp -r "../tmp/${ARCH}"/* sources
+
+## Add `datadog` gem version information
 
 cp ../tmp/version sources