Revert OTE Migration: release-4.15

Containerfile

@@ -1,30 +1,17 @@
 # Will be replaced in the CI with registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10
-FROM golang:1.21 AS builder
+FROM golang:1.18 AS builder
 
 WORKDIR /src
 
 COPY ./ ./
 
 RUN go build -o /bin/openstack-test ./cmd/openshift-tests
 
-# Test extension builder stage (added by ote-migration)
-FROM golang:1.21 AS test-extension-builder
-RUN mkdir -p /go/src/github.com/openshift/openstack-test
-WORKDIR /go/src/github.com/openshift/openstack-test
-COPY . .
-RUN make tests-ext-build && \
-    cd bin && \
-    tar -czvf openstack-test-tests-ext.tar.gz openstack-test-tests-ext && \
-    rm -f openstack-test-tests-ext
-
 # Will be replaced in the CI with registry.ci.openshift.org/ocp/4.y:tools
 FROM registry.access.redhat.com/ubi8/ubi
 
 COPY --from=builder /bin/openstack-test /usr/bin/
 
-# Copy test extension binary (added by ote-migration)
-COPY --from=test-extension-builder /go/src/github.com/openshift/openstack-test/bin/openstack-test-tests-ext.tar.gz /usr/bin/
-
 USER 1000:1000
 ENV LC_ALL en_US.UTF-8
 

Makefile

@@ -1,5 +1,5 @@
 
-openstack-tests: test/extended/openstack/* cmd/openshift-tests/*
+openstack-tests: test/extended/openstack/*
 	go build -o $@ ./cmd/openshift-tests
 
 # Update generated artifacts.
@@ -14,21 +14,3 @@ verify:
 run: openstack-tests
 	./$< run openshift/openstack
 .PHONY: run
-
-# OTE test extension binary configuration
-TESTS_EXT_BINARY := bin/openstack-test-tests-ext
-
-.PHONY: tests-ext-build
-tests-ext-build:
-	@echo "Building OTE test extension binary..."
-	@mkdir -p bin
-	cd tests-extension && GOTOOLCHAIN=auto GOSUMDB=sum.golang.org go build -mod=mod -o $(CURDIR)/$(TESTS_EXT_BINARY) ./cmd/extension
-	@echo "Extension binary built: $(TESTS_EXT_BINARY)"
-
-.PHONY: extension
-extension: tests-ext-build
-
-.PHONY: clean-extension
-clean-extension:
-	@echo "Cleaning extension binary..."
-	@rm -f $(TESTS_EXT_BINARY)