-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add 4.8 and change master to 4.9 #19435
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
ci-operator/config/openshift/os/openshift-os-release-4.8.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| base_images: | ||
| coreos_coreos-assembler_48: | ||
| name: coreos-assembler | ||
| namespace: coreos | ||
| tag: "4.8" | ||
| build_root: | ||
| image_stream_tag: | ||
| name: fcos-buildroot | ||
| namespace: coreos | ||
| tag: testing-devel | ||
| images: | ||
| - dockerfile_path: ci/Dockerfile | ||
| inputs: | ||
| coreos_coreos-assembler_48: | ||
| as: | ||
| - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest | ||
| to: build-test-qemu-img | ||
| resources: | ||
| '*': | ||
| requests: | ||
| cpu: 1000m | ||
| memory: 1Gi | ||
| build-test-qemu: | ||
| limits: | ||
| devices.kubevirt.io/kvm: "1" | ||
| requests: | ||
| cpu: 1000m | ||
| devices.kubevirt.io/kvm: "1" | ||
| memory: 2Gi | ||
| tests: | ||
| - as: validate | ||
| commands: ./ci/validate.sh | ||
| container: | ||
| from: src | ||
| - as: build-test-qemu | ||
| commands: /src/ci/build-test-qemu.sh | ||
| container: | ||
| from: build-test-qemu-img | ||
| zz_generated_metadata: | ||
| branch: release-4.8 | ||
| org: openshift | ||
| repo: os |
147 changes: 147 additions & 0 deletions
147
ci-operator/jobs/openshift/os/openshift-os-release-4.8-presubmits.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| presubmits: | ||
| openshift/os: | ||
| - agent: kubernetes | ||
| always_run: true | ||
| branches: | ||
| - release-4.8 | ||
| cluster: build02 | ||
| context: ci/prow/build-test-qemu | ||
| decorate: true | ||
| decoration_config: | ||
| skip_cloning: true | ||
| labels: | ||
| ci-operator.openshift.io/prowgen-controlled: "true" | ||
| devices.kubevirt.io/kvm: "1" | ||
| pj-rehearse.openshift.io/can-be-rehearsed: "true" | ||
| name: pull-ci-openshift-os-release-4.8-build-test-qemu | ||
| rerun_command: /test build-test-qemu | ||
| 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=build-test-qemu | ||
| 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( | .* )build-test-qemu,?($|\s.*) | ||
| - agent: kubernetes | ||
| always_run: true | ||
| branches: | ||
| - release-4.8 | ||
| cluster: build01 | ||
| context: ci/prow/images | ||
| decorate: true | ||
| decoration_config: | ||
| skip_cloning: true | ||
| labels: | ||
| ci-operator.openshift.io/prowgen-controlled: "true" | ||
| pj-rehearse.openshift.io/can-be-rehearsed: "true" | ||
| name: pull-ci-openshift-os-release-4.8-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.*) | ||
| - agent: kubernetes | ||
| always_run: true | ||
| branches: | ||
| - release-4.8 | ||
| cluster: build01 | ||
| context: ci/prow/validate | ||
| decorate: true | ||
| decoration_config: | ||
| skip_cloning: true | ||
| labels: | ||
| ci-operator.openshift.io/prowgen-controlled: "true" | ||
| pj-rehearse.openshift.io/can-be-rehearsed: "true" | ||
| name: pull-ci-openshift-os-release-4.8-validate | ||
| rerun_command: /test validate | ||
| 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=validate | ||
| 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( | .* )validate,?($|\s.*) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like this should just be called
coreos_coreos-assembler_latestinstead, no? There is no 4.9 cosa yet so this is misleading.Or actually, since we have to keep using the 4.8 image for now until we fix openshift/os#552, maybe better to just not touch this file at all. (But then eventually once we do fix that, it'd be
coreos_coreos-assembler_latesthere andtag: "latest"below.)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jlebon meh, it got merged already. Let me know what do you think, if should I change it following the comments above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's OK, I'm sure we'll keep tweaking these settings in the future as we sort everything out.
Thanks a lot for looking at this!