Merge pull request openshift#564 from ritmun/osde2e-convention

SDCICD-1593 make e2e convention independent of operator convention

Author: openshift-merge-bot[bot]

…nshift/golang-osd-operator-osde2e/OWNERS …lerplate/openshift/golang-osd-e2e/OWNERSboilerplate/openshift/golang-osd-operator-osde2e/OWNERS renamed to boilerplate/openshift/golang-osd-e2e/OWNERS boilerplate/openshift/golang-osd-operator-osde2e/OWNERS renamed to boilerplate/openshift/golang-osd-e2e/OWNERS

@@ -10,7 +10,7 @@
 Currently, this convention is only intended for OSD operators. To adopt this convention, your `boilerplate/update.cfg` should include:
 
 ```
-openshift/golang-osd-operator-osde2e
+openshift/golang-osd-e2e
 ```
 
 ## `make` targets and functions.

…ift/golang-osd-operator-osde2e/README.md …plate/openshift/golang-osd-e2e/README.mdboilerplate/openshift/golang-osd-operator-osde2e/README.md renamed to boilerplate/openshift/golang-osd-e2e/README.md boilerplate/openshift/golang-osd-operator-osde2e/README.md renamed to boilerplate/openshift/golang-osd-e2e/README.md

@@ -12,8 +12,6 @@ parameters:
     required: false
   - name: OCM_CLIENT_SECRET
     required: false
-  - name: OCM_TOKEN
-    required: false
   - name: OCM_CCS
     required: false
   - name: AWS_ACCESS_KEY_ID
@@ -62,14 +60,12 @@ objects:
                 seccompProfile:
                   type: RuntimeDefault
               env:
-                - name: TEST_IMAGES
+                - name: AD_HOC_TEST_IMAGES
                   value: ${TEST_IMAGE}:${IMAGE_TAG}
                 - name: OCM_CLIENT_ID
                   value: ${OCM_CLIENT_ID}
                 - name: OCM_CLIENT_SECRET
                   value: ${OCM_CLIENT_SECRET}
-                - name: OCM_TOKEN
-                  value: ${OCM_TOKEN}
                 - name: OCM_CCS
                   value: ${OCM_CCS}
                 - name: AWS_ACCESS_KEY_ID

…ang-osd-operator-osde2e/e2e-template.yml …penshift/golang-osd-e2e/e2e-template.ymlboilerplate/openshift/golang-osd-operator-osde2e/e2e-template.yml renamed to boilerplate/openshift/golang-osd-e2e/e2e-template.yml boilerplate/openshift/golang-osd-operator-osde2e/e2e-template.yml renamed to boilerplate/openshift/golang-osd-e2e/e2e-template.yml

@@ -45,14 +45,6 @@ REGISTRY_TOKEN ?=
 # TODO: Figure out how to discover this dynamically
 OSDE2E_CONVENTION_DIR := boilerplate/openshift/golang-osd-operator-osde2e
 
-# TODO: figure out how to container-engine-login only once across multiple `make` calls
-.PHONY: container-build-push-one
-container-build-push-one: container-engine-login
-	@(if [[ -z "${IMAGE_URI}" ]]; then echo "Must specify IMAGE_URI"; exit 1; fi)
-	@(if [[ -z "${DOCKERFILE_PATH}" ]]; then echo "Must specify DOCKERFILE_PATH"; exit 1; fi)
-	${CONTAINER_ENGINE} build --pull -f $(DOCKERFILE_PATH) -t $(IMAGE_URI) .
-	${CONTAINER_ENGINE} push ${IMAGE_URI}
-
 # log into quay.io
 .PHONY: container-engine-login
 container-engine-login:
@@ -72,9 +64,10 @@ e2e-binary-build:
 	go mod tidy
 	go test ./test/e2e -v -c --tags=osde2e -o e2e.test
 
-# TODO: Push to a known image tag and commit id
-# push e2e image
+# push e2e image tagged as latest and as repo commit hash
 .PHONY: e2e-image-build-push
 e2e-image-build-push:
-	${OSDE2E_CONVENTION_DIR}/e2e-image-build-push.sh "./test/e2e/Dockerfile $(IMAGE_REGISTRY)/$(E2E_IMAGE_REPOSITORY)/$(E2E_IMAGE_NAME):$(E2E_IMAGE_TAG)"
-	${OSDE2E_CONVENTION_DIR}/e2e-image-build-push.sh "./test/e2e/Dockerfile $(IMAGE_REGISTRY)/$(E2E_IMAGE_REPOSITORY)/$(E2E_IMAGE_NAME):latest"
+	${CONTAINER_ENGINE} build --pull -f test/e2e/Dockerfile -t $(E2E_IMAGE_REGISTRY)/$(E2E_IMAGE_REPOSITORY)/$(E2E_IMAGE_NAME):$(E2E_IMAGE_TAG) .
+	${CONTAINER_ENGINE} tag $(E2E_IMAGE_REGISTRY)/$(E2E_IMAGE_REPOSITORY)/$(E2E_IMAGE_NAME):$(E2E_IMAGE_TAG) $(E2E_IMAGE_REGISTRY)/$(E2E_IMAGE_REPOSITORY)/$(E2E_IMAGE_NAME):latest
+	${CONTAINER_ENGINE} push $(E2E_IMAGE_REGISTRY)/$(E2E_IMAGE_REPOSITORY)/$(E2E_IMAGE_NAME):$(E2E_IMAGE_TAG)
+	${CONTAINER_ENGINE} push $(E2E_IMAGE_REGISTRY)/$(E2E_IMAGE_REPOSITORY)/$(E2E_IMAGE_NAME):latest

…ft/golang-osd-operator-osde2e/project.mk …late/openshift/golang-osd-e2e/project.mkboilerplate/openshift/golang-osd-operator-osde2e/project.mk renamed to boilerplate/openshift/golang-osd-e2e/project.mk boilerplate/openshift/golang-osd-operator-osde2e/project.mk renamed to boilerplate/openshift/golang-osd-e2e/project.mk

@@ -105,3 +105,8 @@ DISABLE_JUNIT_REPORT=true KUBECONFIG=/(path-to)/kubeconfig  ./(path-to)/bin/gink
 EOF
 
 sed -e "s/\${OPERATOR_NAME}/${OPERATOR_NAME}/" $(dirname $0)/e2e-template.yml >"${E2E_SUITE_DIRECTORY}/e2e-template.yml"
+
+# todo: remove after file is renamed in ALL consumer repos
+if [ -f "${E2E_SUITE_DIRECTORY}/test-harness-template.yml" ]; then
+  rm -f "${E2E_SUITE_DIRECTORY}/test-harness-template.yml"
+fi