From 0999dbd99a3369ca508fbef5cb5fc0d9effd167f Mon Sep 17 00:00:00 2001
From: radnov <radnov@pm.me>
Date: Wed, 16 Oct 2024 14:38:36 +0300
Subject: [PATCH] ci: migrate to docker compose v2 CLI in stable and dev
 pipelines [skip ci] (#18841)

Signed-off-by: Rado <radoslav@dhis2.org>
---
 jenkinsfiles/dev    | 6 +++---
 jenkinsfiles/stable | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jenkinsfiles/dev b/jenkinsfiles/dev
index 4eca0bb7bc5a..a76fdcd4f45b 100644
--- a/jenkinsfiles/dev
+++ b/jenkinsfiles/dev
@@ -90,7 +90,7 @@ pipeline {
                             script {
                                 dir("dhis-2/dhis-test-e2e") {
                                     sh "docker pull ${DOCKER_IMAGE_NAME_FULL}"
-                                    sh "DHIS2_IMAGE=${DOCKER_IMAGE_NAME_FULL} docker-compose --project-name ${DOCKER_IMAGE_TAG_BASE} --file docker-compose.yml --file docker-compose.e2e.yml up --remove-orphans --exit-code-from test"
+                                    sh "DHIS2_IMAGE=${DOCKER_IMAGE_NAME_FULL} docker compose --file docker-compose.yml --file docker-compose.e2e.yml up --remove-orphans --exit-code-from test"
                                 }
                             }
                         }
@@ -107,8 +107,8 @@ pipeline {
                             failure {
                                 script {
                                     dir("dhis-2/dhis-test-e2e") {
-                                        sh "docker-compose --project-name ${DOCKER_IMAGE_TAG_BASE} logs web > ${DOCKER_IMAGE_TAG_BASE}_logs.txt"
-                                        archiveArtifacts artifacts: "${DOCKER_IMAGE_TAG_BASE}_logs.txt"
+                                        sh "docker compose logs web > web-logs.txt"
+                                        archiveArtifacts artifacts: "web-logs.txt"
                                     }
                                 }
                             }
diff --git a/jenkinsfiles/stable b/jenkinsfiles/stable
index 6509deb6c338..df505845c6d1 100644
--- a/jenkinsfiles/stable
+++ b/jenkinsfiles/stable
@@ -81,7 +81,7 @@ pipeline {
                             script {
                                 dir("dhis-2/dhis-test-e2e") {
                                     sh "docker pull ${DOCKER_IMAGE_NAME_FULL}"
-                                    sh "DHIS2_IMAGE=${DOCKER_IMAGE_NAME_FULL} docker-compose --project-name ${DOCKER_IMAGE_TAG_BASE} --file docker-compose.yml --file docker-compose.e2e.yml up --remove-orphans --exit-code-from test"
+                                    sh "DHIS2_IMAGE=${DOCKER_IMAGE_NAME_FULL} docker compose --file docker-compose.yml --file docker-compose.e2e.yml up --remove-orphans --exit-code-from test"
                                 }
                             }
                         }
@@ -98,8 +98,8 @@ pipeline {
                             failure {
                                 script {
                                     dir("dhis-2/dhis-test-e2e") {
-                                        sh "docker-compose --project-name ${DOCKER_IMAGE_TAG_BASE} logs web > ${DOCKER_IMAGE_TAG_BASE}_logs.txt"
-                                        archiveArtifacts artifacts: "${DOCKER_IMAGE_TAG_BASE}_logs.txt"
+                                        sh "docker compose logs web > web-logs.txt"
+                                        archiveArtifacts artifacts: "web-logs.txt"
                                     }
                                 }
                             }