From 84ce78edf338f8687cedbea8875ef748bb363d59 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 5 Dec 2025 10:36:42 +0000 Subject: [PATCH 1/2] openstack: Stop calling test openshift make target for CAPO We no longer have code to unit test in this directory. Signed-off-by: Stephen Finucane --- .../openshift-cluster-api-provider-openstack-main.yaml | 2 +- .../openshift-cluster-api-provider-openstack-release-4.22.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml index e538ab6c5e68e..e08092a1db992 100644 --- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml @@ -60,7 +60,7 @@ tests: from: src - as: test-openshift commands: make -C openshift XDG_DATA_HOME=/tmp/data XDG_CACHE_HOME=/tmp/cache KUBEBUILDER_ASSETS_DIR=/tmp/data - verify test + verify container: from: src - as: e2e-hypershift diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml index 7b1025155b7c8..bd5efc4b07009 100644 --- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml @@ -60,7 +60,7 @@ tests: from: src - as: test-openshift commands: make -C openshift XDG_DATA_HOME=/tmp/data XDG_CACHE_HOME=/tmp/cache KUBEBUILDER_ASSETS_DIR=/tmp/data - verify test + verify container: from: src - as: e2e-hypershift From 0ef05053da99ce0f43524a29abc7f33acc13577f Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 5 Dec 2025 10:58:02 +0000 Subject: [PATCH 2/2] openstack: Simplify commands for CAPO tests Signed-off-by: Stephen Finucane --- ...ift-cluster-api-provider-openstack-main.yaml | 17 ++++++++++++----- ...ter-api-provider-openstack-release-4.22.yaml | 17 ++++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml index e08092a1db992..f5bfa697036f3 100644 --- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml @@ -50,17 +50,24 @@ resources: memory: 200Mi tests: - as: verify - commands: make XDG_DATA_HOME=/tmp/data XDG_CACHE_HOME=/tmp/cache verify-modules - verify-gen verify-vendoring + commands: | + export XDG_DATA_HOME=/tmp/data + export XDG_CACHE_HOME=/tmp/cache + make verify-modules verify-gen verify-vendoring container: from: src - as: test - commands: make KUBEBUILDER_ASSETS_DIR=/tmp/data test + commands: | + export KUBEBUILDER_ASSETS_DIR=/tmp/data + make test container: from: src - as: test-openshift - commands: make -C openshift XDG_DATA_HOME=/tmp/data XDG_CACHE_HOME=/tmp/cache KUBEBUILDER_ASSETS_DIR=/tmp/data - verify + commands: | + export XDG_DATA_HOME=/tmp/data + export XDG_CACHE_HOME=/tmp/cache + export KUBEBUILDER_ASSETS_DIR=/tmp/data + make -C openshift verify container: from: src - as: e2e-hypershift diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml index bd5efc4b07009..b627a7d4ba94e 100644 --- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml +++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml @@ -50,17 +50,24 @@ resources: memory: 200Mi tests: - as: verify - commands: make XDG_DATA_HOME=/tmp/data XDG_CACHE_HOME=/tmp/cache verify-modules - verify-gen verify-vendoring + commands: | + export XDG_DATA_HOME=/tmp/data + export XDG_CACHE_HOME=/tmp/cache + make verify-modules verify-gen verify-vendoring container: from: src - as: test - commands: make KUBEBUILDER_ASSETS_DIR=/tmp/data test + commands: | + export KUBEBUILDER_ASSETS_DIR=/tmp/data + make test container: from: src - as: test-openshift - commands: make -C openshift XDG_DATA_HOME=/tmp/data XDG_CACHE_HOME=/tmp/cache KUBEBUILDER_ASSETS_DIR=/tmp/data - verify + commands: | + export XDG_DATA_HOME=/tmp/data + export XDG_CACHE_HOME=/tmp/cache + export KUBEBUILDER_ASSETS_DIR=/tmp/data + make -C openshift verify container: from: src - as: e2e-hypershift