sdcicd-1414 move osde2e/ to test/e2e

Author: ritmun

Makefile

@@ -1,6 +1,6 @@
 SHELL := /usr/bin/env bash
 
-include osde2e/project.mk
+include test/e2e/project.mk
 # Verbosity
 AT_ = @
 AT = $(AT_$(V))

osde2e/Dockerfile renamed to test/e2e/Dockerfile

@@ -1,7 +1,7 @@
 FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
 WORKDIR /go/src/github.com/openshift/managed-cluster-validating-webhooks
 COPY . .
-RUN  CGO_ENABLED=0 GOFLAGS="-mod=mod" go test ./osde2e -v -c --tags=osde2e -o /harness.test
+RUN  CGO_ENABLED=0 GOFLAGS="-mod=mod" go test ./test/e2e -v -c --tags=osde2e -o /harness.test
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 COPY --from=builder ./harness.test harness.test

osde2e/managed_cluster_validating_webhooks_runner_test.go renamed to test/e2e/managed_cluster_validating_webhooks_runner_test.go

@@ -108,7 +108,7 @@ var _ = Describe("Managed Cluster Validating Webhooks", Ordered, func() {
 
 	It("should create a pod with the correct security context", func() {
 		pod := &v1.Pod{
-      			ObjectMeta: metav1.ObjectMeta{
+			ObjectMeta: metav1.ObjectMeta{
 				Name:      "testpod",
 				Namespace: namespaceName,
 			},

osde2e/managed_cluster_validating_webhooks_test.go renamed to test/e2e/managed_cluster_validating_webhooks_test.go

@@ -9,7 +9,7 @@ REGISTRY_USER?=$(QUAY_USER)
 REGISTRY_TOKEN?=$(QUAY_TOKEN)
 
 ######################
-# Targets used by osde2e test harness
+# Targets used by e2e test harness
 ######################
 
 # create binary
@@ -18,7 +18,7 @@ e2e-harness-build: GOFLAGS_MOD=-mod=mod
 e2e-harness-build: GOENV=GOOS=${GOOS} GOARCH=${GOARCH} CGO_ENABLED=0 GOFLAGS="${GOFLAGS_MOD}"
 e2e-harness-build:
 	go mod tidy
-	${GOENV} go test ./osde2e -v -c --tags=osde2e -o harness.test
+	${GOENV} go test ./test/e2e -v -c --tags=osde2e -o harness.test
 
 # TODO: Push to a known image tag and commit id
 # push harness image
@@ -28,7 +28,7 @@ HARNESS_IMAGE_TAG=$(CURRENT_COMMIT)
 
 .PHONY: e2e-image-build-push
 e2e-image-build-push:
-	${CONTAINER_ENGINE} build --pull -f osde2e/Dockerfile -t $(HARNESS_IMAGE_REGISTRY)/$(HARNESS_IMAGE_REPOSITORY)/$(HARNESS_IMAGE_NAME):$(HARNESS_IMAGE_TAG) .
+	${CONTAINER_ENGINE} build --pull -f test/e2e/Dockerfile -t $(HARNESS_IMAGE_REGISTRY)/$(HARNESS_IMAGE_REPOSITORY)/$(HARNESS_IMAGE_NAME):$(HARNESS_IMAGE_TAG) .
 	${CONTAINER_ENGINE} tag $(HARNESS_IMAGE_REGISTRY)/$(HARNESS_IMAGE_REPOSITORY)/$(HARNESS_IMAGE_NAME):$(HARNESS_IMAGE_TAG) $(HARNESS_IMAGE_REGISTRY)/$(HARNESS_IMAGE_REPOSITORY)/$(HARNESS_IMAGE_NAME):latest
 	${CONTAINER_ENGINE} push $(HARNESS_IMAGE_REGISTRY)/$(HARNESS_IMAGE_REPOSITORY)/$(HARNESS_IMAGE_NAME):$(HARNESS_IMAGE_TAG)
 	${CONTAINER_ENGINE} push $(HARNESS_IMAGE_REGISTRY)/$(HARNESS_IMAGE_REPOSITORY)/$(HARNESS_IMAGE_NAME):latest