Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.5.x] Try to fix sqlserver 2017 repo tests #10394

Merged
merged 1 commit into from
Jan 15, 2025
Merged

[4.5.x] Try to fix sqlserver 2017 repo tests #10394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .circleci/ci/src/executors/executor-ubuntu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion .circleci/ci/src/jobs/test-container/job-jdbc-test-container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
);
}
}
2 changes: 1 addition & 1 deletion .circleci/ci/src/pipelines/tests/resources/repositories-tests/repositories-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down