From 4c1f39cd1a96cf127255144e8892485db4bc259f Mon Sep 17 00:00:00 2001
From: Tony Redondo <tony.redondo@datadoghq.com>
Date: Fri, 22 Nov 2024 13:48:52 +0100
Subject: [PATCH 01/11] first try running orchestrion

---
 .gitlab-ci.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a21d6ec3..bd446ca4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -326,13 +326,20 @@ e2e:
     - mkdir -p $CI_PROJECT_DIR/test/e2e/scripts && cp $CI_PROJECT_DIR/install_script*.sh $CI_PROJECT_DIR/test/e2e/scripts
     # Retrieve common go deps
     - mkdir -p $GOPATH/pkg/mod && tar xJf modcache_e2e.tar.xz -C $GOPATH/pkg/mod && rm -f modcache_e2e.tar.xz
+    # Install orchestrion
+    - go install github.com/DataDog/orchestrion@latest
+    - export GOFLAGS="${GOFLAGS} '-toolexec=orchestrion toolexec'"
+    - cd test/e2e && orchestrion pin && cd ../..
+    - export DD_ENV=ci
+    - export DD_SERVICE=agent-linux-install-script
+    - export DD_TAGS="test.codeowners:@DataDog/agent-platform ci.job.name:e2e ci.stage.name:e2e"
   script:
     - cd test/e2e && gotestsum --format standard-verbose --junitfile "junit-${CI_JOB_ID}.xml" -- -timeout 0s . -v --flavor ${FLAVOR} --platform ${PLATFORM} --scriptPath ${SCRIPT_PATH} ${EXTRA_PARAMS}
-  after_script:
-    - set +x
-    - export DATADOG_API_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.agent-linux-install-script.datadog_api_key_2 --with-decryption --query "Parameter.Value" --out text)
-    - set -x
-    - for f in test/e2e/*.xml; do datadog-ci junit upload --service agent-linux-install-script --tags test.codeowners:@DataDog/agent-platform --tags ci.job.name:e2e --tags ci.stage.name:e2e "$f"; done
+  #after_script:
+    #- set +x
+    #- export DATADOG_API_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.agent-linux-install-script.datadog_api_key_2 --with-decryption --query "Parameter.Value" --out text)
+    #- set -x
+    #- for f in test/e2e/*.xml; do datadog-ci junit upload --service agent-linux-install-script --tags test.codeowners:@DataDog/agent-platform --tags ci.job.name:e2e --tags ci.stage.name:e2e "$f"; done
 
   rules:
     - if: $CI_COMMIT_TAG

From 3cdb2740c7ff6644324736a868bd4cdbdb3480e8 Mon Sep 17 00:00:00 2001
From: Tony Redondo <tony.redondo@datadoghq.com>
Date: Fri, 22 Nov 2024 13:51:56 +0100
Subject: [PATCH 02/11] changes

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd446ca4..c5b59111 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -328,8 +328,8 @@ e2e:
     - mkdir -p $GOPATH/pkg/mod && tar xJf modcache_e2e.tar.xz -C $GOPATH/pkg/mod && rm -f modcache_e2e.tar.xz
     # Install orchestrion
     - go install github.com/DataDog/orchestrion@latest
-    - export GOFLAGS="${GOFLAGS} '-toolexec=orchestrion toolexec'"
     - cd test/e2e && orchestrion pin && cd ../..
+    - export GOFLAGS="${GOFLAGS} '-toolexec=orchestrion toolexec'"
     - export DD_ENV=ci
     - export DD_SERVICE=agent-linux-install-script
     - export DD_TAGS="test.codeowners:@DataDog/agent-platform ci.job.name:e2e ci.stage.name:e2e"

From d96539a8cdd6fa7604c6b1a480bc16a71b12640b Mon Sep 17 00:00:00 2001
From: Tony Redondo <tony.redondo@datadoghq.com>
Date: Fri, 22 Nov 2024 14:44:12 +0100
Subject: [PATCH 03/11] changes

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c5b59111..cd96636a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -328,7 +328,8 @@ e2e:
     - mkdir -p $GOPATH/pkg/mod && tar xJf modcache_e2e.tar.xz -C $GOPATH/pkg/mod && rm -f modcache_e2e.tar.xz
     # Install orchestrion
     - go install github.com/DataDog/orchestrion@latest
-    - cd test/e2e && orchestrion pin && cd ../..
+    - cd test/e2e && orchestrion pin
+    - cd ../..
     - export GOFLAGS="${GOFLAGS} '-toolexec=orchestrion toolexec'"
     - export DD_ENV=ci
     - export DD_SERVICE=agent-linux-install-script

From 831cf6fef2414bdb2b07f0d28bc564f73dfeb43a Mon Sep 17 00:00:00 2001
From: Tony Redondo <tony.redondo@datadoghq.com>
Date: Mon, 25 Nov 2024 15:01:23 +0100
Subject: [PATCH 04/11] changes

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd96636a..5388339e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -332,6 +332,8 @@ e2e:
     - cd ../..
     - export GOFLAGS="${GOFLAGS} '-toolexec=orchestrion toolexec'"
     - export DD_ENV=ci
+    - export DD_CIVISIBILITY_ENABLED=true
+    - export DD_CIVISIBILITY_AGENTLESS_ENABLED=true
     - export DD_SERVICE=agent-linux-install-script
     - export DD_TAGS="test.codeowners:@DataDog/agent-platform ci.job.name:e2e ci.stage.name:e2e"
   script:

From e3bcd2f9cfaf1c48d178288dd8cd1b21dcf5f40a Mon Sep 17 00:00:00 2001
From: Tony Redondo <tony.redondo@datadoghq.com>
Date: Mon, 25 Nov 2024 22:05:11 +0100
Subject: [PATCH 05/11] changes

---
 .gitlab-ci.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5388339e..ce509d40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -338,11 +338,6 @@ e2e:
     - export DD_TAGS="test.codeowners:@DataDog/agent-platform ci.job.name:e2e ci.stage.name:e2e"
   script:
     - cd test/e2e && gotestsum --format standard-verbose --junitfile "junit-${CI_JOB_ID}.xml" -- -timeout 0s . -v --flavor ${FLAVOR} --platform ${PLATFORM} --scriptPath ${SCRIPT_PATH} ${EXTRA_PARAMS}
-  #after_script:
-    #- set +x
-    #- export DATADOG_API_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.agent-linux-install-script.datadog_api_key_2 --with-decryption --query "Parameter.Value" --out text)
-    #- set -x
-    #- for f in test/e2e/*.xml; do datadog-ci junit upload --service agent-linux-install-script --tags test.codeowners:@DataDog/agent-platform --tags ci.job.name:e2e --tags ci.stage.name:e2e "$f"; done
 
   rules:
     - if: $CI_COMMIT_TAG

From 22bb2659732c19e05b128bdb15792ddcd3fb7800 Mon Sep 17 00:00:00 2001
From: Tony Redondo <tonyredondo@gmail.com>
Date: Tue, 26 Nov 2024 17:44:37 +0100
Subject: [PATCH 06/11] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce509d40..45814055 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -327,7 +327,7 @@ e2e:
     # Retrieve common go deps
     - mkdir -p $GOPATH/pkg/mod && tar xJf modcache_e2e.tar.xz -C $GOPATH/pkg/mod && rm -f modcache_e2e.tar.xz
     # Install orchestrion
-    - go install github.com/DataDog/orchestrion@latest
+    - go install github.com/DataDog/orchestrion@v0.9.4
     - cd test/e2e && orchestrion pin
     - cd ../..
     - export GOFLAGS="${GOFLAGS} '-toolexec=orchestrion toolexec'"

From 6bdf39d1e8a62df4a54ead7fd01db426584265ff Mon Sep 17 00:00:00 2001
From: Tony Redondo <tonyredondo@gmail.com>
Date: Mon, 9 Dec 2024 14:34:27 +0100
Subject: [PATCH 07/11] Update .gitlab-ci.yml

Co-authored-by: pducolin <45568537+pducolin@users.noreply.github.com>
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45814055..e9ad4e89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -335,7 +335,7 @@ e2e:
     - export DD_CIVISIBILITY_ENABLED=true
     - export DD_CIVISIBILITY_AGENTLESS_ENABLED=true
     - export DD_SERVICE=agent-linux-install-script
-    - export DD_TAGS="test.codeowners:@DataDog/agent-platform ci.job.name:e2e ci.stage.name:e2e"
+    - export DD_TAGS="test.codeowners:@DataDog/agent-delivery ci.job.name:e2e ci.stage.name:e2e"
   script:
     - cd test/e2e && gotestsum --format standard-verbose --junitfile "junit-${CI_JOB_ID}.xml" -- -timeout 0s . -v --flavor ${FLAVOR} --platform ${PLATFORM} --scriptPath ${SCRIPT_PATH} ${EXTRA_PARAMS}
 

From 60b87ad606aeb9da298fcd1393a60342282117e0 Mon Sep 17 00:00:00 2001
From: Tony Redondo <tonyredondo@gmail.com>
Date: Fri, 21 Feb 2025 14:30:23 +0100
Subject: [PATCH 08/11] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9ad4e89..50c75d90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -328,7 +328,7 @@ e2e:
     - mkdir -p $GOPATH/pkg/mod && tar xJf modcache_e2e.tar.xz -C $GOPATH/pkg/mod && rm -f modcache_e2e.tar.xz
     # Install orchestrion
     - go install github.com/DataDog/orchestrion@v0.9.4
-    - cd test/e2e && orchestrion pin
+    - cd test/e2e && orchestrion pin && go mod tidy
     - cd ../..
     - export GOFLAGS="${GOFLAGS} '-toolexec=orchestrion toolexec'"
     - export DD_ENV=ci

From a5974758f15532e5cb9b61fcfd4b8521daf3f4ab Mon Sep 17 00:00:00 2001
From: Tony Redondo <tonyredondo@gmail.com>
Date: Mon, 3 Mar 2025 09:25:43 +0100
Subject: [PATCH 09/11] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50c75d90..b195fddc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -327,7 +327,7 @@ e2e:
     # Retrieve common go deps
     - mkdir -p $GOPATH/pkg/mod && tar xJf modcache_e2e.tar.xz -C $GOPATH/pkg/mod && rm -f modcache_e2e.tar.xz
     # Install orchestrion
-    - go install github.com/DataDog/orchestrion@v0.9.4
+    - go install github.com/DataDog/orchestrion@v1.0.4
     - cd test/e2e && orchestrion pin && go mod tidy
     - cd ../..
     - export GOFLAGS="${GOFLAGS} '-toolexec=orchestrion toolexec'"

From 8773a6577961029041b810e49b8bdc6441ad182e Mon Sep 17 00:00:00 2001
From: Tony Redondo <tonyredondo@gmail.com>
Date: Mon, 3 Mar 2025 11:48:09 +0100
Subject: [PATCH 10/11] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b195fddc..50c75d90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -327,7 +327,7 @@ e2e:
     # Retrieve common go deps
     - mkdir -p $GOPATH/pkg/mod && tar xJf modcache_e2e.tar.xz -C $GOPATH/pkg/mod && rm -f modcache_e2e.tar.xz
     # Install orchestrion
-    - go install github.com/DataDog/orchestrion@v1.0.4
+    - go install github.com/DataDog/orchestrion@v0.9.4
     - cd test/e2e && orchestrion pin && go mod tidy
     - cd ../..
     - export GOFLAGS="${GOFLAGS} '-toolexec=orchestrion toolexec'"

From edd4eca382056e22f996eba8c0fc5911f72c4e68 Mon Sep 17 00:00:00 2001
From: Tony Redondo <tonyredondo@gmail.com>
Date: Mon, 3 Mar 2025 14:28:51 +0100
Subject: [PATCH 11/11] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50c75d90..19f99de2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -327,7 +327,7 @@ e2e:
     # Retrieve common go deps
     - mkdir -p $GOPATH/pkg/mod && tar xJf modcache_e2e.tar.xz -C $GOPATH/pkg/mod && rm -f modcache_e2e.tar.xz
     # Install orchestrion
-    - go install github.com/DataDog/orchestrion@v0.9.4
+    - go install github.com/DataDog/orchestrion@v1.1.0
     - cd test/e2e && orchestrion pin && go mod tidy
     - cd ../..
     - export GOFLAGS="${GOFLAGS} '-toolexec=orchestrion toolexec'"