Core: Generate xUnit Reports for e2e tests

make/test.mk

@@ -38,6 +38,8 @@ E2E_PARALLELISM=1
 
 TESTS_RUN_FILTER_REGEXP ?= ""
 
+REPORT_PORTAL_DIR := rp_preproc/results
+
 .PHONY: test-e2e
 ## Run the e2e tests
 test-e2e: INSTALL_OPERATOR=true
@@ -66,13 +68,13 @@ verify-migration-and-deploy-e2e: prepare-projects e2e-deploy-latest e2e-migratio
 .PHONY: e2e-migration-setup
 e2e-migration-setup:
 	@echo "Setting up the environment before testing the operator migration..."
-	$(MAKE) execute-tests MEMBER_NS=${MEMBER_NS} MEMBER_NS_2=${MEMBER_NS_2} HOST_NS=${HOST_NS} REGISTRATION_SERVICE_NS=${REGISTRATION_SERVICE_NS} TESTS_TO_EXECUTE="./test/migration/setup"
+	$(MAKE) execute-tests MEMBER_NS=${MEMBER_NS} MEMBER_NS_2=${MEMBER_NS_2} HOST_NS=${HOST_NS} REGISTRATION_SERVICE_NS=${REGISTRATION_SERVICE_NS} TESTS_TO_EXECUTE="./test/migration/setup" REPORT_NAME="xunit_e2e_migration_setup.xml"
 	@echo "Environment successfully setup."
 
 .PHONY: e2e-migration-verify
 e2e-migration-verify:
 	@echo "Updating operators and verifying resources..."
-	$(MAKE) execute-tests MEMBER_NS=${MEMBER_NS} MEMBER_NS_2=${MEMBER_NS_2} HOST_NS=${HOST_NS} REGISTRATION_SERVICE_NS=${REGISTRATION_SERVICE_NS} TESTS_TO_EXECUTE="./test/migration/verify"
+	$(MAKE) execute-tests MEMBER_NS=${MEMBER_NS} MEMBER_NS_2=${MEMBER_NS_2} HOST_NS=${HOST_NS} REGISTRATION_SERVICE_NS=${REGISTRATION_SERVICE_NS} TESTS_TO_EXECUTE="./test/migration/verify" REPORT_NAME="xunit_e2e_migration_verify.xml"
 	@echo "Migration tests successfully finished"
 
 .PHONY: e2e-deploy-latest
@@ -141,13 +143,13 @@ test-e2e-registration-local:
 .PHONY: e2e-run-parallel
 e2e-run-parallel:
 	@echo "Running e2e tests in parallel..."
-	$(MAKE) execute-tests MEMBER_NS=${MEMBER_NS} MEMBER_NS_2=${MEMBER_NS_2} HOST_NS=${HOST_NS} REGISTRATION_SERVICE_NS=${REGISTRATION_SERVICE_NS} TESTS_TO_EXECUTE="./test/e2e/parallel" E2E_PARALLELISM=100
+	$(MAKE) execute-tests MEMBER_NS=${MEMBER_NS} MEMBER_NS_2=${MEMBER_NS_2} HOST_NS=${HOST_NS} REGISTRATION_SERVICE_NS=${REGISTRATION_SERVICE_NS} TESTS_TO_EXECUTE="./test/e2e/parallel" E2E_PARALLELISM=100 REPORT_NAME="xunit_e2e_parallel.xml"
 	@echo "The parallel e2e tests successfully finished"
 
 .PHONY: e2e-run
 e2e-run:
 	@echo "Running e2e tests..."
-	$(MAKE) execute-tests MEMBER_NS=${MEMBER_NS} MEMBER_NS_2=${MEMBER_NS_2} HOST_NS=${HOST_NS} REGISTRATION_SERVICE_NS=${REGISTRATION_SERVICE_NS} TESTS_TO_EXECUTE="./test/e2e ./test/metrics"
+	$(MAKE) execute-tests MEMBER_NS=${MEMBER_NS} MEMBER_NS_2=${MEMBER_NS_2} HOST_NS=${HOST_NS} REGISTRATION_SERVICE_NS=${REGISTRATION_SERVICE_NS} TESTS_TO_EXECUTE="./test/e2e ./test/metrics"  REPORT_NAME="xunit_e2e.xml"
 	@echo "The e2e tests successfully finished"
 
 .PHONY: execute-tests
@@ -157,7 +159,7 @@ execute-tests:
 	@echo "Status of ToolchainStatus"
 	-oc get ToolchainStatus -n ${HOST_NS} -o yaml
 	@echo "Starting test $(shell date)"
-	MEMBER_NS=${MEMBER_NS} MEMBER_NS_2=${MEMBER_NS_2} HOST_NS=${HOST_NS} REGISTRATION_SERVICE_NS=${REGISTRATION_SERVICE_NS} go test ${TESTS_TO_EXECUTE} -run ${TESTS_RUN_FILTER_REGEXP} -p 1 -parallel ${E2E_PARALLELISM} -v -timeout=90m -failfast || \
+	MEMBER_NS=${MEMBER_NS} MEMBER_NS_2=${MEMBER_NS_2} HOST_NS=${HOST_NS} REGISTRATION_SERVICE_NS=${REGISTRATION_SERVICE_NS} go test ${TESTS_TO_EXECUTE} -run ${TESTS_RUN_FILTER_REGEXP} -p 1 -parallel ${E2E_PARALLELISM} -v -timeout=90m -failfast 2>&1 | $(MAKE) generate-report REPORT_NAME=${REPORT_NAME}  || \
 	($(MAKE) print-logs HOST_NS=${HOST_NS} MEMBER_NS=${MEMBER_NS} MEMBER_NS_2=${MEMBER_NS_2} REGISTRATION_SERVICE_NS=${REGISTRATION_SERVICE_NS} && exit 1)
 
 .PHONY: print-logs
@@ -175,6 +177,25 @@ else
 	$(MAKE) print-local-debug-info  HOST_NS=${HOST_NS} MEMBER_NS=${MEMBER_NS} MEMBER_NS_2=${MEMBER_NS_2} REGISTRATION_SERVICE_NS=${REGISTRATION_SERVICE_NS}
 endif
 
+#.PHONY: check-go-junit-report
+
+# check-go-junit-report:
+# 	PATH=${PATH}:$(go env GOPATH)/bin go-junit-report > ${ARTIFACT_DIR}/${REPORT_PORTAL_DIR}/${REPORT_NAME}
+# 	@command -v go-junit-report >/dev/null 2>&1 || { echo "go-junit-report is not installed. Installing..."; go install github.com/jstemmer/go-junit-report/v2@latest; }
+# 	@echo "go-junit-report version:" && go-junit-report -version
+
+.PHONY: generate-report
+generate-report:
+	@echo "Generating report"
+ifneq ($(OPENSHIFT_BUILD_NAMESPACE),) 
+	mkdir -p  ${ARTIFACT_DIR}/${REPORT_PORTAL_DIR}
+	go install github.com/jstemmer/go-junit-report/v2@latest
+	PATH=${PATH}:$(go env GOPATH)/bin go-junit-report > ${ARTIFACT_DIR}/${REPORT_PORTAL_DIR}/${REPORT_NAME}
+	@echo "xUnit Report Generation Successful"
+else 
+	@echo "Skipping Report as its a local run"
+endif
+
 .PHONY: deploy-e2e-local-and-print-local-debug
 deploy-e2e-local-and-print-local-debug: deploy-e2e-local print-local-debug-info
 

openshift-ci/Dockerfile.tools

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/ubi:latest as build-tools
+FROM registry.access.redhat.com/ubi8/go-toolset:1.20.12-5.1713833129 as build-tools
 
 LABEL maintainer "Devtools <[email protected]>"
 LABEL author "Devtools <[email protected]>"
@@ -8,12 +8,13 @@ ENV LANG=en_US.utf8 \
     GOCACHE=/tmp/.cache \
     PATH=$PATH:$GOPATH/bin \
     GIT_COMMITTER_NAME=devtools \
-    [email protected] \
-    GOLANG_VERSION=go1.20.11 \
-    GOLANG_SHA256=ef79a11aa095a08772d2a69e4f152f897c4e96ee297b0dc20264b7dec2961abe
+    [email protected]
 
 ARG GO_PACKAGE_PATH=github.com/codeready-toolchain/toolchain-e2e
 
+# Switch to root user to install packages
+USER root
+
 RUN yum install -y \
     findutils \
     git \
@@ -27,20 +28,22 @@ RUN yum install -y \
     gcc \
     && yum clean all
 
-WORKDIR /tmp
+# Switch back to the default user
+USER 1001
 
-# download, verify and install golang
-ENV PATH=$PATH:/usr/local/go/bin
-RUN curl -Lo ${GOLANG_VERSION}.linux-amd64.tar.gz https://dl.google.com/go/${GOLANG_VERSION}.linux-amd64.tar.gz \
-    && echo "${GOLANG_SHA256} ${GOLANG_VERSION}.linux-amd64.tar.gz" > ${GOLANG_VERSION}.linux-amd64.sha256 \
-    && sha256sum -c ${GOLANG_VERSION}.linux-amd64.sha256 \
-    && tar xzf ${GOLANG_VERSION}.linux-amd64.tar.gz \
-    && tar -C /usr/local -xzf ${GOLANG_VERSION}.linux-amd64.tar.gz \
-    && rm -f ${GOLANG_VERSION}.linux-amd64.tar.gz \
-    && go version
+WORKDIR /tmp
 
 RUN mkdir -p ${GOPATH}/src/${GO_PACKAGE_PATH}/
 
+# Install the go-junit-report package
+RUN go install github.com/jstemmer/go-junit-report/v2@latest
+
+# Ensure the installed Go package is in the PATH
+ENV PATH=$PATH:$GOPATH/bin
+
+# Verify the installation
+RUN go-junit-report --version
+
 WORKDIR ${GOPATH}/src/${GO_PACKAGE_PATH}
 
 ENTRYPOINT [ "/bin/bash" ]