Skip to content

Commit b1cc2ed

Browse files
authored
Fix some flaky tests (#1304)
* tests: Update used docker version The `stable` version does not get updates anymore. The updated DIND version is required for systems without `iptables` support. * test: Add dotenv report artifacts to gitignore
1 parent 363b027 commit b1cc2ed

File tree

7 files changed

+9
-7
lines changed

7 files changed

+9
-7
lines changed

examples/docker-in-docker-build-with-local-registry/.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ alpine-image:
66
command:
77
- --insecure-registry=gitlab-ci-local-registry:5000
88
needs: []
9-
image: docker:latest
9+
image: docker:cli
1010
stage: build
1111
script:
1212
- docker pull $CI_REGISTRY_IMAGE:latest || true

examples/docker-in-docker-build/.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ alpine-image:
44
services:
55
- docker:dind
66
needs: []
7-
image: docker:stable
7+
image: docker:cli
88
stage: build
99
script:
1010
- printenv

examples/docker-swarm-php/.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ composer-install:
1717
# @Description Build/Push PHP image
1818
build-php:
1919
needs: [composer-install]
20-
image: docker:stable
20+
image: docker:cli
2121
stage: build
2222
artifacts:
2323
reports:
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/build.env
2+
multi*.env

tests/test-cases/dind-no-tls/.gitlab-ci.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
test-job:
3-
image: docker.io/library/docker:stable
3+
image: docker.io/library/docker:cli
44
services:
5-
- name: docker.io/library/docker:stable-dind
5+
# Pinned to 27-dind in case non-TLS DIND is removed at some point in the future.
6+
- name: docker.io/library/docker:27-dind
67
alias: docker
78
variables:
89
DOCKER_HOST: tcp://docker:2375

tests/test-cases/dind-no-tls/integration.dind-no-tls.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test("dind-no-tls <test-job> --needs", async () => {
2525
expect(writeStreams.stdoutLines).toEqual(expect.arrayContaining(expectedStdout));
2626

2727
const expectedStderr = [
28-
chalk`{blueBright test-job} {redBright >} WARNING: API is accessible on http://0.0.0.0:2375 without encryption.`,
28+
chalk`{blueBright test-job} {redBright >} [DEPRECATION NOTICE]: API is accessible on http://0.0.0.0:2375 without encryption.`,
2929
];
3030
expect(writeStreams.stderrLines).toEqual(expect.arrayContaining(expectedStderr));
3131
});

tests/test-cases/dind-tls/.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test-job:
44
- name: docker.io/library/docker:dind
55
alias: docker
66
needs: []
7-
image: docker.io/library/docker:stable
7+
image: docker.io/library/docker:cli
88
stage: build
99
script:
1010
- docker pull -q alpine 1> /dev/null

0 commit comments

Comments
 (0)