Skip to content
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

Merge all Prow CI scripts into one #839

Merged
merged 1 commit into from Jun 9, 2022

Conversation

travier
Copy link
Member

@travier travier commented Jun 9, 2022

This will increase code re-use and simplify future CI changes.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 9, 2022
@openshift-ci openshift-ci bot requested review from dustymabe and lucab June 9, 2022 14:29
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 9, 2022
ci/prow-entrypoint.sh Outdated Show resolved Hide resolved
ci/prow-entrypoint.sh Outdated Show resolved Hide resolved
ci/prow-entrypoint.sh Outdated Show resolved Hide resolved
ci/prow-entrypoint.sh Outdated Show resolved Hide resolved
ci/prow-entrypoint.sh Outdated Show resolved Hide resolved
@miabbott
Copy link
Member

miabbott commented Jun 9, 2022

Overall approach looks sound, just need to clean up some of the duplicated code and correct things to use RHEL 8.6

@travier travier force-pushed the prow branch 2 times, most recently from bf40222 to fa25711 Compare June 9, 2022 15:58
ci/prow-entrypoint.sh Outdated Show resolved Hide resolved
@travier travier changed the title WIP: Merge all Prow CI scripts into one Merge all Prow CI scripts into one Jun 9, 2022
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 9, 2022
ci/prow-entrypoint.sh Outdated Show resolved Hide resolved
ci/prow-entrypoint.sh Outdated Show resolved Hide resolved
ci/prow-entrypoint.sh Outdated Show resolved Hide resolved
@travier travier force-pushed the prow branch 4 times, most recently from a879002 to ffaee4e Compare June 9, 2022 17:04
@travier
Copy link
Member Author

travier commented Jun 9, 2022

This is failing on:

+ curl -L http://base-4-11-rhel86.ocp.svc.cluster.local
/src/ci/prow-entrypoint.sh: line 53: src/config/ocp.repo: Permission denied

@miabbott
Copy link
Member

miabbott commented Jun 9, 2022

I think the permissions problem is due to this:

+ cosa init --transient /src
info: Missing CAP_SYS_ADMIN; using virt
+ mkdir -p src
+ cd src
+ test -e config
+ case "${source}" in
+ ln -s /src/ config

The /src checkout must be created as root when the job starts, but we are running as builder, so we can't write to that location.

Maybe we hack around this by copying /src to $(mktemp -d)/src as a workaround and init from that new repo instead?

Regroup all CI scripts that build an RHCOS image and test it into a
single one to avoid duplication. This will also simplify future CI
changes.
@miabbott
Copy link
Member

miabbott commented Jun 9, 2022

Looks promising

�[36mINFO�[0m[2022-06-09T18:03:55Z] Building src                                 
�[36mINFO�[0m[2022-06-09T18:06:00Z] Build src succeeded after 2m1s               
�[36mINFO�[0m[2022-06-09T18:06:00Z] Building build-test-qemu-img                 
�[36mINFO�[0m[2022-06-09T18:11:40Z] Build build-test-qemu-img succeeded after 5m36s 
�[36mINFO�[0m[2022-06-09T18:11:40Z] Running multi-stage test test-qemu-kola      
�[36mINFO�[0m[2022-06-09T18:11:40Z] Running multi-stage phase pre                
�[36mINFO�[0m[2022-06-09T18:11:40Z] Step phase pre succeeded after 0s.           
�[36mINFO�[0m[2022-06-09T18:11:40Z] Running multi-stage phase test               
�[36mINFO�[0m[2022-06-09T18:11:40Z] Running step test-qemu-kola-test.            

@travier
Copy link
Member Author

travier commented Jun 9, 2022

Next step in openshift/release#29329 once this one is ready

@miabbott
Copy link
Member

miabbott commented Jun 9, 2022

/lgtm

Great job, @travier !

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 9, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 9, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: miabbott, travier

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 448cbb2 into openshift:master Jun 9, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 9, 2022

@travier: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants