Skip to content

Commit

Permalink
Add scripts to execute tests against openshift CI. RHDP-417
Browse files Browse the repository at this point in the history
Signed-off-by: Flavius Lacatusu <[email protected]>
  • Loading branch information
flacatus committed Dec 7, 2021
1 parent fb4e569 commit 560c830
Show file tree
Hide file tree
Showing 6 changed files with 333 additions and 108 deletions.
36 changes: 36 additions & 0 deletions .ci/openshift-ci/oci-launch-e2e.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#!/bin/bash
# exit immediately when a command fails
set -e
# only exit with zero if all commands of the pipeline exit successfully
set -o pipefail
# error on unset variables
set -u

export WORKSPACE=$(dirname $(dirname $(readlink -f "$0")));

# catch and stop execution on any error
trap "catchFinishedCode" EXIT SIGINT

# Catch an error after existing from jenkins Workspace
function catchFinishedCode() {
EXIT_CODE=$?

if [ "$EXIT_CODE" == "1" ]; then
echo "[ERROR] Failed to validate e2e tests against Red Hat App Studio. Please check Openshift CI logs"
fi

exit $EXIT_CODE
}

function installRedHatAppStudio() {
git clone https://github.com/redhat-appstudio/infra-deployments.git
"${WORKSPACE}"/infra-deployments/hack/bootstrap-cluster.sh
}

function runE2ETests() {
make build
make run
}

installRedHatAppStudio
runE2ETests
18 changes: 18 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Binaries for programs and plugins
*.exe
*.exe~
*.dll
*.so
*.dylib

# Test binary, built with `go test -c`
*.test
coverage.*
# Output of the go coverage tool, specifically when used with LiteIDE
*.out

# Dependency directories (remove the comment below to include it)
vendor/
bin/
.idea/
tmp/
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ vendor/
bin/
.idea/
tmp/
output/
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
BINARY_NAME := ./bin/e2e-appstudio
E2E_BIN := ./bin/e2e-appstudio
E2E_ARGS_EXEC ?= ""
CONTAINER_TAG ?= next
CONTAINER_IMAGE_NAME := quay.io/redhat-appstudio/e2e:$(CONTAINER_TAG)

build:
go mod vendor && CGO_ENABLED=0 go test -v -c -o $(BINARY_NAME) ./cmd/e2e_test.go
go mod vendor && CGO_ENABLED=0 go test -v -c -o $(E2E_BIN) ./cmd/e2e_test.go

build-container:
podman build -t $(CONTAINER_IMAGE_NAME) --no-cache .

push-container:
podman push $(CONTAINER_IMAGE_NAME)

run:
$(E2E_BIN) $(E2E_ARGS_EXEC)
50 changes: 25 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,36 @@ require (
github.com/google/go-cmp v0.5.6 // indirect
github.com/onsi/ginkgo/v2 v2.0.0-rc2
github.com/onsi/gomega v1.17.0
github.com/redhat-appstudio/application-service v0.0.0-20211117223714-9b9dcc98c5e9
github.com/redhat-appstudio/application-service v0.0.0-20211202175550-0f7b9c8fcc7d
golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 // indirect
k8s.io/apimachinery v0.22.4
k8s.io/client-go v11.0.1-0.20190816222228-6d55c1b1f1ca+incompatible
sigs.k8s.io/controller-runtime v0.10.3
)

replace (
k8s.io/api => k8s.io/api v0.21.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
k8s.io/apimachinery => k8s.io/apimachinery v0.21.0
k8s.io/apiserver => k8s.io/apiserver v0.21.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
k8s.io/client-go => k8s.io/client-go v0.21.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.0
k8s.io/code-generator => k8s.io/code-generator v0.21.0
k8s.io/component-base => k8s.io/component-base v0.21.0
k8s.io/component-helpers => k8s.io/component-helpers v0.21.0
k8s.io/controller-manager => k8s.io/controller-manager v0.21.0
k8s.io/cri-api => k8s.io/cri-api v0.21.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.0
k8s.io/kubectl => k8s.io/kubectl v0.21.0
k8s.io/kubelet => k8s.io/kubelet v0.21.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.0
k8s.io/metrics => k8s.io/metrics v0.21.0
k8s.io/mount-utils => k8s.io/mount-utils v0.21.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
k8s.io/api => k8s.io/api v0.21.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.4
k8s.io/apimachinery => k8s.io/apimachinery v0.21.4
k8s.io/apiserver => k8s.io/apiserver v0.21.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.4
k8s.io/client-go => k8s.io/client-go v0.21.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.4
k8s.io/code-generator => k8s.io/code-generator v0.21.4
k8s.io/component-base => k8s.io/component-base v0.21.4
k8s.io/component-helpers => k8s.io/component-helpers v0.21.4
k8s.io/controller-manager => k8s.io/controller-manager v0.21.4
k8s.io/cri-api => k8s.io/cri-api v0.21.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.4
k8s.io/kubectl => k8s.io/kubectl v0.21.4
k8s.io/kubelet => k8s.io/kubelet v0.21.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.4
k8s.io/metrics => k8s.io/metrics v0.21.4
k8s.io/mount-utils => k8s.io/mount-utils v0.21.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.4
)
Loading

0 comments on commit 560c830

Please sign in to comment.