From 7d2a552763051dceddecd07b2f3751cb04962718 Mon Sep 17 00:00:00 2001
From: Florent CHAMFROY <florent.chamfroy@graviteesource.com>
Date: Wed, 15 Jan 2025 12:46:24 +0100
Subject: [PATCH] ci: fix the ubuntu machine executor for JDBC repository tests
 [skip CI]

(cherry picked from commit 679a755e8f82b07520fbb1f856bed458de0bf5ff)
---
 .circleci/ci/src/executors/executor-ubuntu.ts             | 8 ++++++--
 .../ci/src/jobs/test-container/job-jdbc-test-container.ts | 2 +-
 .../resources/repositories-tests/repositories-tests.yml   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.circleci/ci/src/executors/executor-ubuntu.ts b/.circleci/ci/src/executors/executor-ubuntu.ts
index b25453ba40c..7cb189c2cd1 100644
--- a/.circleci/ci/src/executors/executor-ubuntu.ts
+++ b/.circleci/ci/src/executors/executor-ubuntu.ts
@@ -19,8 +19,12 @@ import { Executor } from '@circleci/circleci-config-sdk/dist/src/lib/Components/
 import { MachineResourceClass } from '@circleci/circleci-config-sdk/dist/src/lib/Components/Executors/types/MachineExecutor.types';
 
 export class UbuntuExecutor {
-  public static create(resource: MachineResourceClass = 'medium', useDockerLayerCaching: boolean = false): Executor {
-    const image = `ubuntu-${config.executor.ubuntu.version}:${config.executor.ubuntu.tag}`;
+  public static create(
+    resource: MachineResourceClass = 'medium',
+    useDockerLayerCaching: boolean = false,
+    imageTag: string = config.executor.ubuntu.tag,
+  ): Executor {
+    const image = `ubuntu-${config.executor.ubuntu.version}:${imageTag}`;
     return new executors.MachineExecutor(resource, image, useDockerLayerCaching);
   }
 }
diff --git a/.circleci/ci/src/jobs/test-container/job-jdbc-test-container.ts b/.circleci/ci/src/jobs/test-container/job-jdbc-test-container.ts
index af82af8c1e4..2fa29d8f1a5 100644
--- a/.circleci/ci/src/jobs/test-container/job-jdbc-test-container.ts
+++ b/.circleci/ci/src/jobs/test-container/job-jdbc-test-container.ts
@@ -33,7 +33,7 @@ export class JdbcTestContainerJob extends AbstractTestContainerJob {
         command: `cd gravitee-apim-repository
 mvn -pl 'gravitee-apim-repository-jdbc' -am -s ../${config.maven.settingsFile} clean package --no-transfer-progress -Dskip.validation=true -DjdbcType=<< parameters.jdbcType>> -T 2C`,
       }),
-      UbuntuExecutor.create('medium', true),
+      UbuntuExecutor.create('medium', true, '2024.08.1'),
     );
   }
 }
diff --git a/.circleci/ci/src/pipelines/tests/resources/repositories-tests/repositories-tests.yml b/.circleci/ci/src/pipelines/tests/resources/repositories-tests/repositories-tests.yml
index 37d8ad46c52..15014498ea4 100644
--- a/.circleci/ci/src/pipelines/tests/resources/repositories-tests/repositories-tests.yml
+++ b/.circleci/ci/src/pipelines/tests/resources/repositories-tests/repositories-tests.yml
@@ -121,7 +121,7 @@ jobs:
         default: ""
         description: "Type and version of the database to test. Example: mariadb:10.5"
     machine:
-      image: ubuntu-2204:current
+      image: ubuntu-2204:2024.08.1
       docker_layer_caching: true
     resource_class: medium
     steps: