Skip to content

Commit 25cf7d1

Browse files
authored
Merge branch 'main' into qe-test
2 parents 27d4919 + 753c85a commit 25cf7d1

20 files changed

+0
-1317
lines changed

.github/workflows/linter.yml

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

Makefile

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -205,31 +205,6 @@ argo-healthcheck: ## Checks if all argo applications are synced
205205

206206
##@ Test and Linters Tasks
207207

208-
CHARTS=$(shell find . -type f -iname 'Chart.yaml' -exec dirname "{}" \; | grep -v examples | sed -e 's/.\///')
209-
# Section related to tests and linting
210-
TEST_OPTS= -f values-global.yaml \
211-
--set global.repoURL="https://github.com/pattern-clone/mypattern" \
212-
--set main.git.repoURL="https://github.com/pattern-clone/mypattern" \
213-
--set main.git.revision=main --set global.pattern="mypattern" \
214-
--set global.namespace="pattern-namespace" \
215-
--set global.hubClusterDomain=apps.hub.example.com \
216-
--set global.localClusterDomain=apps.region.example.com \
217-
--set global.clusterDomain=region.example.com \
218-
--set global.clusterVersion="4.12" \
219-
--set global.clusterPlatform=aws \
220-
--set "clusterGroup.imperative.jobs[0].name"="test" \
221-
--set "clusterGroup.imperative.jobs[0].playbook"="rhvp.cluster_utils.test"
222-
PATTERN_OPTS=-f common/examples/values-example.yaml
223-
EXECUTABLES=git helm oc ansible
224-
225-
.PHONY: test
226-
test: ## run helm tests
227-
@for t in $(CHARTS); do common/scripts/test.sh $$t all "$(TEST_OPTS)"; if [ $$? != 0 ]; then exit 1; fi; done
228-
229-
.PHONY: helmlint
230-
helmlint: ## run helm lint
231-
@for t in $(CHARTS); do common/scripts/lint.sh $$t $(TEST_OPTS); if [ $$? != 0 ]; then exit 1; fi; done
232-
233208
.PHONY: qe-tests
234209
qe-tests: ## Runs the tests that QE runs
235210
@set -e; if [ -f ./tests/interop/run_tests.sh ]; then \
@@ -238,14 +213,6 @@ qe-tests: ## Runs the tests that QE runs
238213
echo "No ./tests/interop/run_tests.sh found skipping"; \
239214
fi
240215

241-
API_URL ?= https://raw.githubusercontent.com/hybrid-cloud-patterns/ocp-schemas/main/openshift/4.10/
242-
KUBECONFORM_SKIP ?= -skip 'CustomResourceDefinition,ClusterIssuer,CertManager,Certificate,ArgoCD'
243-
244-
# We need to skip 'CustomResourceDefinition' as openapi2jsonschema seems to be unable to generate them ATM
245-
.PHONY: kubeconform
246-
kubeconform: ## run helm kubeconform
247-
@for t in $(CHARTS); do helm template $(TEST_OPTS) $(PATTERN_OPTS) $$t | kubeconform -strict $(KUBECONFORM_SKIP) -verbose -schema-location $(API_URL); if [ $$? != 0 ]; then exit 1; fi; done
248-
249216
.PHONY: super-linter
250217
super-linter: ## Runs super linter locally
251218
rm -rf .mypy_cache

examples/blank/Chart.yaml

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

examples/blank/templates/manifest.yaml

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

examples/blank/values.yaml

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

examples/industrial-edge-factory.yaml

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

0 commit comments

Comments
 (0)