WIP: try to fix cluster-api okd jobs

openshift · Apr 26, 2024 · 4fde677 · 4fde677
1 parent 335c624
commit 4fde677
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master__okd-scos.yaml b/ci-operator/config/openshift/cluster-api/openshift-cluster-api-master__okd-scos.yaml
@@ -7,11 +7,10 @@ base_images:
     name: scos-4.16
     namespace: origin
     tag: base-stream9
+binary_build_commands: make manager-core
 build_root:
-  image_stream_tag:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-1.21-openshift-4.16
+  from_repository: true
+canonical_go_repository: sigs.k8s.io/cluster-api
 images:
 - context_dir: openshift
   dockerfile_path: Dockerfile.openshift

diff --git a/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-master-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-master-postsubmits.yaml
@@ -65,14 +65,13 @@ postsubmits:
     - ^master$
     cluster: build02
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci-operator.openshift.io/variant: okd-scos
       ci.openshift.io/generator: prowgen
     max_concurrency: 1
     name: branch-ci-openshift-cluster-api-master-okd-scos-images
+    path_alias: sigs.k8s.io/cluster-api
     spec:
       containers:
       - args:

diff --git a/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-api/openshift-cluster-api-master-presubmits.yaml
@@ -627,14 +627,13 @@ presubmits:
     cluster: build02
     context: ci/prow/okd-scos-images
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/variant: okd-scos
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-cluster-api-master-okd-scos-images
     optional: true
+    path_alias: sigs.k8s.io/cluster-api
     rerun_command: /test okd-scos-images
     spec:
       containers: