Skip to content

Commit bb6fa90

Browse files
committed
dind update
1 parent cedf888 commit bb6fa90

File tree

2 files changed

+5
-99
lines changed

2 files changed

+5
-99
lines changed

.gitlab-ci.yml

Lines changed: 5 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,18 @@
11
---
22
image: "buluma/github-action-molecule:4.0.9"
33

4-
services:
5-
- docker:dind
4+
# services:
5+
# - docker:dind
66

77
variables:
8-
DOCKER_HOST: "tcp://docker:2375"
8+
# DOCKER_HOST: "tcp://docker:2375"
99
PY_COLORS: 1
1010

1111
molecule:
1212
stage: build
1313
allow_failure: true
1414
script:
1515
- image=${image} tag=${tag} molecule test
16-
retry: 1
17-
parallel:
18-
matrix:
19-
- image: "alpine-openrc"
20-
tag: "latest"
21-
- image: "amazonlinux"
22-
tag: "latest"
23-
- image: "enterpriselinux"
24-
tag: "latest"
25-
- image: "debian-systemd"
26-
tag: "latest"
27-
- image: "debian-systemd"
28-
tag: "bookworm"
29-
- image: "fedora-systemd"
30-
tag: "34"
31-
- image: "fedora-systemd"
32-
tag: "35"
33-
- image: "fedora-systemd"
34-
tag: "latest"
35-
- image: "docker-opensuse-systemd"
36-
tag: "latest"
37-
- image: "docker-ubuntu-systemd"
38-
tag: "latest"
39-
- image: "docker-ubuntu-systemd"
40-
tag: "bionic"
41-
- image: "docker-ubuntu-systemd"
42-
tag: "focal"
43-
- image: "docker-ubuntu-systemd"
44-
tag: "jammy"
45-
46-
testing:
47-
stage: test
48-
needs: []
49-
script:
50-
- image=${image} tag=${tag} molecule test
51-
rules:
52-
- if: $CI_COMMIT_REF_NAME == "testing"
53-
retry: 1
5416
parallel:
5517
matrix:
5618
- image: "alpine-openrc"
@@ -81,60 +43,7 @@ testing:
8143
tag: "jammy"
8244

8345
galaxy:
84-
stage: deploy
85-
needs: []
8646
script:
87-
- ansible-galaxy role info buluma.terraform
88-
89-
role_testing:
90-
stage: test
91-
needs: []
92-
script:
93-
- image=${image} tag=${tag} ansible-galaxy install buluma.terraform
94-
retry: 1
95-
parallel:
96-
matrix:
97-
- image: "alpine-openrc"
98-
tag: "latest"
99-
- image: "amazonlinux"
100-
tag: "latest"
101-
- image: "enterpriselinux"
102-
tag: "latest"
103-
- image: "debian-systemd"
104-
tag: "latest"
105-
- image: "debian-systemd"
106-
tag: "bookworm"
107-
- image: "fedora-systemd"
108-
tag: "34"
109-
- image: "fedora-systemd"
110-
tag: "35"
111-
- image: "fedora-systemd"
112-
tag: "latest"
113-
- image: "docker-opensuse-systemd"
114-
tag: "latest"
115-
- image: "docker-ubuntu-systemd"
116-
tag: "latest"
117-
- image: "docker-ubuntu-systemd"
118-
tag: "bionic"
119-
- image: "docker-ubuntu-systemd"
120-
tag: "focal"
121-
- image: "docker-ubuntu-systemd"
122-
tag: "jammy"
123-
124-
release_job:
125-
stage: .post
126-
needs: [molecule]
127-
image: registry.gitlab.com/gitlab-org/release-cli:latest
47+
- ansible-galaxy role import --api-key ${GALAXY_API_KEY} ${CI_PROJECT_NAMESPACE} ${CI_PROJECT_NAME}
12848
rules:
129-
- if: $CI_COMMIT_TAG
130-
script:
131-
- echo "Running the release job."
132-
release:
133-
tag_name: $CI_COMMIT_TAG
134-
name: 'Release $CI_COMMIT_TAG'
135-
description: 'Release created using the release-cli.'
136-
artifacts:
137-
name: "$CI_JOB_STAGE-$CI_COMMIT_REF_NAME"
138-
paths:
139-
- /
140-
expire_in: 1 day
49+
- if: $CI_COMMIT_TAG != null

molecule/default/molecule.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,5 @@ provisioner:
2929
config_options:
3030
defaults:
3131
interpreter_python: auto_legacy_silent
32-
callback_whitelist: profile_tasks
33-
ssh_connection:
34-
pipelining: true
3532
verifier:
3633
name: ansible

0 commit comments

Comments
 (0)