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

Jump to bottom

e2e: Run on other architectures #799

Merged
merged 9 commits into from
Mar 14, 2022
Merged

e2e: Run on other architectures #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8aa8aa2
e2e: Run on other architectures
gquillar Feb 28, 2022
8b069ca
fix test failure
gquillar Mar 1, 2022
dfc27a5
Merge branch 'openshift:master' into e2e_multi-arch
gquillar Mar 1, 2022
4d96f27
e2e: Run on other architectures
gquillar Feb 28, 2022
3b9e897
fix test failure
gquillar Mar 1, 2022
892c886
Merge branch 'e2e_multi-arch' of https://github.com/gquillar/complian…
gquillar Mar 3, 2022
48cd821
fix tag usage for openscap-ocp
gquillar Mar 4, 2022
2fb49f6
add push of latest tag for test-broken-content image
gquillar Mar 8, 2022
214fa7a
change profile bundle definition for broken_os_detection image
gquillar Mar 10, 2022
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
35 changes: 21 additions & 14 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ RELATED_IMAGE_OPENSCAP_TAG?=1.3.5
# Image path to use. Set this if you want to use a specific path for building
# or your e2e tests. This is overwritten if we bulid the image and push it to
# the cluster or if we're on CI.
DEFAULT_IMAGE_OPERATOR_PATH=quay.io/compliance-operator/$(APP_NAME):latest
DEFAULT_IMAGE_OPENSCAP_PATH=quay.io/compliance-operator/$(RELATED_IMAGE_OPENSCAP_NAME):$(RELATED_IMAGE_OPENSCAP_TAG)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do I see correctly that this variable definition is twice in the Makefile?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not the same variable: one for operator and one for openscap

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oups I see, DEFAULT_IMAGE_OPENSCAP_PATH declaration at line 2 was an extra paste. Need to be removed

RELATED_IMAGE_OPERATOR_PATH?=$(IMAGE_REPO)/$(APP_NAME)
RELATED_IMAGE_OPENSCAP_PATH=$(IMAGE_REPO)/$(RELATED_IMAGE_OPENSCAP_NAME)
RELATED_IMAGE_OPENSCAP_PATH?=$(IMAGE_REPO)/$(RELATED_IMAGE_OPENSCAP_NAME)
OPENSCAP_DOCKER_CONTEXT=./images/openscap

# Image tag to use. Set this if you want to use a specific tag for building
Expand Down Expand Up @@ -112,8 +114,9 @@ E2E_GO_TEST_FLAGS?=-test.v -test.timeout 120m
# Specifies the image path to use for the content in the tests
DEFAULT_CONTENT_IMAGE_PATH=quay.io/complianceascode/ocp4:latest
E2E_CONTENT_IMAGE_PATH?=quay.io/complianceascode/ocp4:latest
# We specifically omit the tag here since we only use this for testing.
E2E_BROKEN_CONTENT_IMAGE_PATH?=quay.io/compliance-operator/test-broken-content:latest
# We specifically omit the tag here since we use this for testing
# different images referenced by different tags.
E2E_BROKEN_CONTENT_IMAGE_PATH?=quay.io/compliance-operator/test-broken-content

QUAY_NAMESPACE=compliance-operator
OPERATOR_VERSION?=
Expand Down Expand Up @@ -197,9 +200,13 @@ test-catalog: index-image-to-cluster
@oc apply -f deploy/olm-catalog/operator-group.yaml
@oc apply -f deploy/olm-catalog/subscription.yaml

.PHONY: test-broken-content-image
test-broken-content-image:
$(RUNTIME) build -t $(E2E_BROKEN_CONTENT_IMAGE_PATH) -f images/testcontent/broken-content.Dockerfile .
.PHONY: e2e-content-images
e2e-content-images:
RUNTIME=$(RUNTIME) images/testcontent/broken-content.sh build ${E2E_BROKEN_CONTENT_IMAGE_PATH}

.PHONY: push-e2e-content
push-e2e-content: e2e-content-images
RUNTIME=$(RUNTIME) images/testcontent/broken-content.sh push ${E2E_BROKEN_CONTENT_IMAGE_PATH}

.PHONY: must-gather-image
must-gather-image:
Expand Down Expand Up @@ -300,24 +307,24 @@ test-benchmark: ## Run the benchmark tests -- Note that this can only be ran for
e2e: namespace tear-down operator-sdk image-to-cluster openshift-user deploy-crds ## Run the end-to-end tests
@echo "WARNING: This will temporarily modify deploy/operator.yaml"
@echo "Replacing workload references in deploy/operator.yaml"
@$(SED) 's%$(IMAGE_REPO)/$(RELATED_IMAGE_OPENSCAP_NAME):$(RELATED_IMAGE_OPENSCAP_TAG)%$(RELATED_IMAGE_OPENSCAP_PATH)%' deploy/operator.yaml
@$(SED) 's%$(IMAGE_REPO)/$(APP_NAME):latest%$(RELATED_IMAGE_OPERATOR_PATH)%' deploy/operator.yaml
@$(SED) 's%$(DEFAULT_IMAGE_OPENSCAP_PATH)%$(RELATED_IMAGE_OPENSCAP_PATH)%' deploy/operator.yaml
@$(SED) 's%$(DEFAULT_IMAGE_OPERATOR_PATH)%$(RELATED_IMAGE_OPERATOR_PATH)%' deploy/operator.yaml
@$(SED) 's%$(DEFAULT_CONTENT_IMAGE_PATH)%$(E2E_CONTENT_IMAGE_PATH)%' deploy/operator.yaml
@echo "Running e2e tests"
unset GOFLAGS && BROKEN_CONTENT_IMAGE=$(E2E_BROKEN_CONTENT_IMAGE_PATH) CONTENT_IMAGE=$(E2E_CONTENT_IMAGE_PATH) $(GOPATH)/bin/operator-sdk test local ./tests/e2e --skip-cleanup-error --image "$(RELATED_IMAGE_OPERATOR_PATH)" --go-test-flags "$(E2E_GO_TEST_FLAGS)"
@echo "Restoring image references in deploy/operator.yaml"
@$(SED) 's%$(RELATED_IMAGE_OPENSCAP_PATH)%$(IMAGE_REPO)/$(RELATED_IMAGE_OPENSCAP_NAME):$(RELATED_IMAGE_OPENSCAP_TAG)%' deploy/operator.yaml
@$(SED) 's%$(RELATED_IMAGE_OPERATOR_PATH)%$(IMAGE_REPO)/$(APP_NAME):latest%' deploy/operator.yaml
@$(SED) 's%$(RELATED_IMAGE_OPENSCAP_PATH)%$(DEFAULT_IMAGE_OPENSCAP_PATH)%' deploy/operator.yaml
@$(SED) 's%$(RELATED_IMAGE_OPERATOR_PATH)%$(DEFAULT_IMAGE_OPERATOR_PATH)%' deploy/operator.yaml
@$(SED) 's%$(E2E_CONTENT_IMAGE_PATH)%$(DEFAULT_CONTENT_IMAGE_PATH)%' deploy/operator.yaml

e2e-local: operator-sdk tear-down deploy-crds ## Run the end-to-end tests on a locally running operator (e.g. using make run)
@echo "WARNING: This will temporarily modify deploy/operator.yaml"
@echo "Replacing workload references in deploy/operator.yaml"
@$(SED) 's%$(IMAGE_REPO)/$(APP_NAME):latest%$(RELATED_IMAGE_OPERATOR_PATH)%' deploy/operator.yaml
@$(SED) 's%$(DEFAULT_IMAGE_OPERATOR_PATH)%$(RELATED_IMAGE_OPERATOR_PATH)%' deploy/operator.yaml
@$(SED) 's%$(DEFAULT_CONTENT_IMAGE_PATH)%$(E2E_CONTENT_IMAGE_PATH)%' deploy/operator.yaml
unset GOFLAGS && CONTENT_IMAGE=$(E2E_CONTENT_IMAGE_PATH) $(GOPATH)/bin/operator-sdk test local ./tests/e2e --up-local --skip-cleanup-error --image "$(RELATED_IMAGE_OPERATOR_PATH)" --go-test-flags "$(E2E_GO_TEST_FLAGS)"
@echo "Restoring image references in deploy/operator.yaml"
@$(SED) 's%$(RELATED_IMAGE_OPERATOR_PATH)%$(IMAGE_REPO)/$(APP_NAME):latest%' deploy/operator.yaml
@$(SED) 's%$(RELATED_IMAGE_OPERATOR_PATH)%$(DEFAULT_IMAGE_OPERATOR_PATH)%' deploy/operator.yaml
@$(SED) 's%$(E2E_CONTENT_IMAGE_PATH)%$(DEFAULT_CONTENT_IMAGE_PATH)%' deploy/operator.yaml

# If IMAGE_FROM_CI is not defined, it means that we're not running on CI, so we
Expand Down Expand Up @@ -389,8 +396,8 @@ deploy: namespace deploy-crds ## Deploy the operator from the manifests in the d

.PHONY: deploy-local
deploy-local: namespace image-to-cluster deploy-crds ## Deploy the operator from the manifests in the deploy/ directory and the images from a local build
$(SED) 's%$(IMAGE_REPO)/$(APP_NAME):latest%$(RELATED_IMAGE_OPERATOR_PATH)%' deploy/operator.yaml
$(SED) 's%$(IMAGE_REPO)/$(RELATED_IMAGE_OPENSCAP_NAME):$(RELATED_IMAGE_OPENSCAP_TAG)%$(RELATED_IMAGE_OPENSCAP_PATH)%' deploy/operator.yaml
@$(SED) 's%$(IMAGE_REPO)/$(APP_NAME):latest%$(RELATED_IMAGE_OPERATOR_PATH)%' deploy/operator.yaml
@$(SED) 's%$(IMAGE_REPO)/$(RELATED_IMAGE_OPENSCAP_NAME):$(RELATED_IMAGE_OPENSCAP_TAG)%$(RELATED_IMAGE_OPENSCAP_PATH)%' deploy/operator.yaml
@oc apply -n $(NAMESPACE) -f deploy/
@oc apply -f deploy/olm-catalog/compliance-operator/manifests/monitoring_clusterrolebinding.yaml
@oc apply -f deploy/olm-catalog/compliance-operator/manifests/monitoring_clusterrole.yaml
Expand Down
3 changes: 2 additions & 1 deletion images/testcontent/broken-content.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal

COPY tests/data/ocp4-unexistent-resource.xml .
ARG xml_path
COPY $xml_path/* .
39 changes: 39 additions & 0 deletions images/testcontent/broken-content.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#!/usr/bin/env bash

BUILD_PATH=images/testcontent
DOCKERFILE=${BUILD_PATH}/broken-content.Dockerfile

declare -a tags=(
'unexistent_resource'
'proff_diff_baseline'
'proff_diff_mod'
'rem_mod_base'
'rem_mod_change'
'broken_os_detection'
'from'
'to'
'kubeletconfig'
'variabletemplate'
)

CMD=$1
IMAGE_NAME=$2

if [[ "$CMD" != "build" ]] && [[ "$CMD" != "push" ]]; then
echo "Invalid command '$CMD', it should be 'build' or 'push'"
exit 1
fi

for tag in "${tags[@]}"
do
if [[ "$CMD" == "build" ]]; then
${RUNTIME} build -t ${IMAGE_NAME}:${tag} \
--build-arg xml_path=${BUILD_PATH}/${tag} \
-f ${DOCKERFILE} .
else
${RUNTIME} push ${IMAGE_NAME}:${tag}
fi
done
if [[ "$CMD" == "push" ]]; then
${RUNTIME} push ${IMAGE_NAME}:unexistent_resource ${IMAGE_NAME}:latest
fi
Loading