Use docker compose v2 for tests (#66)

* wip

* wip

* use docker compose

* wip

* clean a bit

Author: czoido

artifactory_tests/run_tests.sh

@@ -1,35 +1,20 @@
 #!/usr/bin/env bash
-
 set -e
 
-# Upgrade pip and install dependencies
 pip install --upgrade pip
-pip install docker-compose
-pip install "docker==6.1.3"
-
-# Function to compare versions
-function version_gt() { 
-    test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"
-}
-
-min_artifactory_version="6.9.0"
-if version_gt "$min_artifactory_version" "$ARTIFACTORY_VERSION"; then
-    echo "Artifactory version $ARTIFACTORY_VERSION does not support Conan revisions, exiting successfully."
-    exit 0
-fi
 
 echo "Building Docker containers..."
-docker-compose build
-docker-compose pull
+docker compose build
+docker compose pull
 
 echo "Starting Docker containers and running tests..."
-docker-compose up -d
-if docker-compose run test_runner ./launch.sh; then
+docker compose up -d
+if docker compose run test_runner ./launch.sh; then
     echo "Tests passed!"
-    docker-compose down
+    docker compose down
     exit 0
 else
     echo "Tests failed or Artifactory failed to start."
-    docker-compose down
+    docker compose down
     exit 99
 fi

jenkins/Jenkinsfile

@@ -20,13 +20,13 @@ try{
     node("LinuxSlave") {
         stage("Testing revisions with Artifactory"){
             checkout scm
-            // FIXME: uncomment latest when the docker image works again
+            sh 'sudo apt-get update && sudo apt-get install -y docker-compose-plugin'
             def arti_versions = (branch != 'develop2' && !branch.startsWith('release/2.')) ? ["latest", "7.63.14", "7.59.9", "7.55.13", "7.47.12", "7.37.17" , "7.27.10", "7.17.5", "7.2.1", "6.18.1", "6.9.0"] : ["latest", "7.63.14", "7.59.9", "7.55.13"]
             for (arti_version in arti_versions){
                 echo "Testing Artifactory ${arti_version} with Conan '${branch}'"
                 withEnv(["CONAN_GIT_TAG=${branch}".toString(), 'CONAN_GIT_REPO=https://github.com/conan-io/conan.git', "ARTIFACTORY_VERSION=${arti_version}"]) {
                     withCredentials([string(credentialsId: 'NEW_ART_LICENSE', variable: 'ART_LICENSE')]) {
-                        sh(script: "cd artifactory_tests && ./run_tests.sh")
+                        sh 'cd artifactory_tests && ./run_tests.sh'
                     }
                 }
             }
@@ -40,7 +40,6 @@ catch(e){
     throw e
 }
 
-// these tests are not prepared for Conan 2.0, omit them
 if (branch != 'develop2' && !branch.startsWith('release/2.'))
 {
     def builders = [:]
@@ -100,7 +99,6 @@ if (branch != 'develop2' && !branch.startsWith('release/2.'))
     }
 }
 
-
 def subject = "SUCCESS ${env.JOB_NAME}! Another day with a green ${branch}!"
 def summary = "${subject} (${env.BUILD_URL})"
 slackSend (color: '#00FF00', message: summary)