Skip to content

Commit

Permalink
kni: scheduler-plugin: branch out 4.18 and point main to 4.19 (opensh…
Browse files Browse the repository at this point in the history
…ift#59695)

Create 4.18 relevant config and jobs and redirect main to 4.19.

Signed-off-by: Shereen Haj <shajmakh@redhat.com>
  • Loading branch information
shajmakh authored and yingzhanredhat committed Dec 24, 2024
1 parent ee1e2c9 commit ad22190
Show file tree
Hide file tree
Showing 5 changed files with 293 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ promotion:
releases:
initial:
integration:
name: "4.18"
name: "4.19"
namespace: ocp
latest:
integration:
include_built_images: true
name: "4.18"
name: "4.19"
namespace: ocp
resources:
'*':
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
base_images:
os-min9:
name: ubi-minimal
namespace: ocp
tag: "9"
binary_build_commands: make -f Makefile.kni build-noderesourcetopology-plugin
build_root:
project_image:
dockerfile_path: build/noderesourcetopology-plugin/Dockerfile.tools
images:
- dockerfile_path: build/noderesourcetopology-plugin/Dockerfile.openshift
from: os-min9
inputs:
bin:
paths:
- destination_dir: .
source_path: /go/src/github.com/openshift-kni/scheduler-plugins/bin/noderesourcetopology-plugin
to: scheduler-plugins
promotion:
to:
- name: scheduler-plugins-4.18
namespace: ocp-kni
releases:
initial:
integration:
name: "4.18"
namespace: ocp
latest:
integration:
include_built_images: true
name: "4.18"
namespace: ocp
resources:
'*':
requests:
cpu: 100m
memory: 200Mi
tests:
- as: ci-unit
commands: make -f Makefile.kni unit-test-quick
container:
from: src
- as: security
optional: true
steps:
env:
PROJECT_NAME: noderesourcetopology-scheduler
workflow: openshift-ci-security
zz_generated_metadata:
branch: release-4.18
org: openshift-kni
repo: scheduler-plugins
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
postsubmits:
openshift-kni/scheduler-plugins:
- agent: kubernetes
always_run: true
branches:
- ^release-4\.18$
cluster: build03
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/is-promotion: "true"
ci.openshift.io/generator: prowgen
max_concurrency: 1
name: branch-ci-openshift-kni-scheduler-plugins-release-4.18-images
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
- --promote
- --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: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/push-secret
name: push-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: push-secret
secret:
secretName: registry-push-credentials-ci-central
- name: result-aggregator
secret:
secretName: result-aggregator
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
presubmits:
openshift-kni/scheduler-plugins:
- agent: kubernetes
always_run: true
branches:
- ^release-4\.18$
- ^release-4\.18-
cluster: build03
context: ci/prow/ci-unit
decorate: true
decoration_config:
skip_cloning: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-kni-scheduler-plugins-release-4.18-ci-unit
rerun_command: /test ci-unit
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=ci-unit
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )ci-unit,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^release-4\.18$
- ^release-4\.18-
cluster: build03
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-openshift-kni-scheduler-plugins-release-4.18-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: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )images,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^release-4\.18$
- ^release-4\.18-
cluster: build03
context: ci/prow/security
decorate: true
decoration_config:
skip_cloning: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-kni-scheduler-plugins-release-4.18-security
optional: true
rerun_command: /test security
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
- --secret-dir=/secrets/ci-pull-credentials
- --target=security
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )security,?($|\s.*)
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ registry.ci.openshift.org/ocp-kni/telco-ran-tools:telco-ran-tools quay.io/opensh
registry.ci.openshift.org/ocp-kni/telco-ran-tools-1.0:telco-ran-tools quay.io/openshift-kni/telco-ran-tools:1.0
# scheduler-plugins
registry.ci.openshift.org/ocp-kni/scheduler-plugins:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:test-ci
registry.ci.openshift.org/ocp-kni/scheduler-plugins:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:4.18-snapshot
registry.ci.openshift.org/ocp-kni/scheduler-plugins:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:4.19-snapshot
registry.ci.openshift.org/ocp-kni/scheduler-plugins-4.18:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:4.18-snapshot
registry.ci.openshift.org/ocp-kni/scheduler-plugins-4.17:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:4.17-snapshot
registry.ci.openshift.org/ocp-kni/scheduler-plugins-4.16:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:4.16-snapshot
registry.ci.openshift.org/ocp-kni/scheduler-plugins-4.15:scheduler-plugins quay.io/openshift-kni/scheduler-plugins:4.15-snapshot
Expand Down

0 comments on commit ad22190

Please sign in to comment.