ostreedev/ostree: Update Prow configuration

This will pair with ostreedev/ostree#2893
cgwalters · Jun 27, 2023 · 3daaedd · 3daaedd
1 parent 9736d85
commit 3daaedd
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 10 deletions.
diff --git a/ci-operator/config/ostreedev/ostree/ostreedev-ostree-main.yaml b/ci-operator/config/ostreedev/ostree/ostreedev-ostree-main.yaml
@@ -1,19 +1,41 @@
-binary_build_commands: env SKIP_INSTALLDEPS=1 ./ci/build.sh
+base_images:
+  coreos_coreos-assembler_latest:
+    name: coreos-assembler
+    namespace: coreos
+    tag: latest
 build_root:
   image_stream_tag:
     name: fcos-buildroot
     namespace: coreos
     tag: testing-devel
+images:
+- dockerfile_path: ci/prow/Dockerfile
+  inputs:
+    coreos_coreos-assembler_latest:
+      as:
+      - registry.ci.openshift.org/coreos/coreos-assembler:latest
+    root:
+      as:
+      - registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel
+  to: base-fcos-e2e
 resources:
   '*':
     requests:
       cpu: 1000m
+      memory: 1Gi
+  fcos-e2e:
+    limits:
+      devices.kubevirt.io/kvm: "1"
+    requests:
+      cpu: 1000m
+      devices.kubevirt.io/kvm: "1"
       memory: 2Gi
 tests:
-- as: sanity
-  commands: ostree --version
+- as: fcos-e2e
+  commands: fcos-e2e
   container:
-    from: bin
+    from: base-fcos-e2e
+  skip_if_only_changed: ^docs/|^\.github/|\.md$|^(?:.*/)?(?:\.gitignore)$
 zz_generated_metadata:
   branch: main
   org: ostreedev

diff --git a/ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-main-presubmits.yaml b/ci-operator/jobs/ostreedev/ostree/ostreedev-ostree-main-presubmits.yaml
@@ -6,23 +6,24 @@ presubmits:
     - ^main$
     - ^main-
     cluster: build02
-    context: ci/prow/sanity
+    context: ci/prow/fcos-e2e
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
+      devices.kubevirt.io/kvm: "1"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-ostreedev-ostree-main-sanity
-    rerun_command: /test sanity
+    name: pull-ci-ostreedev-ostree-main-fcos-e2e
+    rerun_command: /test fcos-e2e
     skip_if_only_changed: ^docs/|^\.github/|\.md$|^(?:.*/)?(?:\.gitignore)$
     spec:
       containers:
       - args:
         - --gcs-upload-secret=/secrets/gcs/service-account.json
         - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
         - --report-credentials-file=/etc/report/credentials
-        - --target=sanity
+        - --target=fcos-e2e
         command:
         - ci-operator
         image: ci-operator:latest
@@ -49,4 +50,53 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )sanity,?($|\s.*)
+    trigger: (?m)^/test( | .* )fcos-e2e,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^main$
+    - ^main-
+    cluster: build04
+    context: ci/prow/images
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-ostreedev-ostree-main-images
+    rerun_command: /test images
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --report-credentials-file=/etc/report/credentials
+        - --target=[images]
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )images,?($|\s.*)
diff --git a/core-services/sanitize-prow-jobs/_config.yaml b/core-services/sanitize-prow-jobs/_config.yaml
@@ -9706,7 +9706,6 @@ buildFarm:
       - operator-framework-operator-registry-release-4.5-postsubmits.yaml
       - operator-framework-operator-registry-release-4.6-postsubmits.yaml
       - operator-framework-operator-registry-release-4.7-postsubmits.yaml
-      - ostreedev-ostree-main-presubmits.yaml
       - package-operator-package-operator-main-presubmits.yaml
       - project-flotta-flotta-operator-main-presubmits.yaml
       - project-flotta-flotta-operator-release-4.11-presubmits.yaml
@@ -14416,6 +14415,7 @@ buildFarm:
       - openstack-k8s-operators-neutron-operator-main-presubmits.yaml
       - openstack-k8s-operators-nova-operator-main-presubmits.yaml
       - openstack-k8s-operators-placement-operator-main-presubmits.yaml
+      - ostreedev-ostree-main-presubmits.yaml
       - redhat-appstudio-managed-gitops-main-presubmits.yaml
       - redhat-appstudio-release-service-main-presubmits.yaml
       - quay-quay-tests-master-periodics.yaml