Skip to content

Commit abb465f

Browse files
authored
Merge pull request #597 from mhjacks/factor_out_ansible
Factor out ansible into separate collection repo
2 parents 369d693 + 0b3ac1e commit abb465f

129 files changed

Lines changed: 12 additions & 8525 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/linters/.gitleaks.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
[whitelist]
22
# As of v4, gitleaks only matches against filename, not path in the
33
# files directive. Leaving content for backwards compatibility.
4-
files = [
5-
"ansible/plugins/modules/*.py",
6-
"ansible/tests/unit/test_*.py",
7-
"ansible/tests/unit/v1/*.yaml",
8-
]
4+
files = [ ]

.github/workflows/ansible-lint.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/workflows/ansible-unittest.yml

Lines changed: 0 additions & 52 deletions
This file was deleted.

Makefile

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ secrets-backend-none: ## Edits values files to remove secrets manager + ESO
115115
.PHONY: load-iib
116116
load-iib: ## CI target to install Index Image Bundles
117117
@set -e; if [ x$(INDEX_IMAGES) != x ]; then \
118-
ansible-playbook common/ansible/playbooks/iib-ci/iib-ci.yaml; \
118+
ansible-playbook rhvp.cluster_utils.iib-ci; \
119119
else \
120120
echo "No INDEX_IMAGES defined. Bailing out"; \
121121
exit 1; \
@@ -218,7 +218,7 @@ TEST_OPTS= -f values-global.yaml \
218218
--set global.clusterVersion="4.12" \
219219
--set global.clusterPlatform=aws \
220220
--set "clusterGroup.imperative.jobs[0].name"="test" \
221-
--set "clusterGroup.imperative.jobs[0].playbook"="ansible/test.yml"
221+
--set "clusterGroup.imperative.jobs[0].playbook"="rhvp.cluster_utils.test"
222222
PATTERN_OPTS=-f common/examples/values-example.yaml
223223
EXECUTABLES=git helm oc ansible
224224

@@ -260,15 +260,6 @@ super-linter: ## Runs super linter locally
260260
-w /tmp/lint \
261261
ghcr.io/super-linter/super-linter:slim-v7
262262

263-
.PHONY: ansible-lint
264-
ansible-lint: ## run ansible lint on ansible/ folder
265-
podman run -it -v $(PWD):/workspace:rw,z --workdir /workspace --env ANSIBLE_CONFIG=./ansible/ansible.cfg \
266-
--entrypoint "/usr/local/bin/ansible-lint" quay.io/ansible/creator-ee:latest "-vvv" "ansible/"
267-
268-
.PHONY: ansible-unittest
269-
ansible-unittest: ## run ansible unit tests
270-
pytest -r a --fulltrace --color yes ansible/tests/unit/test_*.py
271-
272263
.PHONY: deploy upgrade legacy-deploy legacy-upgrade
273264
deploy upgrade legacy-deploy legacy-upgrade:
274265
@echo "UNSUPPORTED TARGET: please switch to 'operator-deploy'"; exit 1

ansible/ansible.cfg

Lines changed: 0 additions & 6 deletions
This file was deleted.

ansible/playbooks/acm/acmhub-get-ca.yaml

Lines changed: 0 additions & 53 deletions
This file was deleted.

ansible/playbooks/auto-approve-installplans/auto-approve-installplans.yaml

Lines changed: 0 additions & 40 deletions
This file was deleted.

ansible/playbooks/hello-world/hello-world.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

ansible/playbooks/iib-ci/iib-ci.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

ansible/playbooks/iib-ci/lookup.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)