Skip to content
This repository was archived by the owner on Dec 1, 2022. It is now read-only.

Update update-ci.sh#1239

Merged
openshift-merge-robot merged 4 commits into
openshift:mainfrom
nak3:fix-tls
Sep 8, 2022
Merged

Update update-ci.sh#1239
openshift-merge-robot merged 4 commits into
openshift:mainfrom
nak3:fix-tls

Conversation

@nak3
Copy link
Copy Markdown

@nak3 nak3 commented Sep 8, 2022

This patch updates update-ci.sh:

/cc @skonto @mgencur

@openshift-ci openshift-ci Bot requested review from mgencur and skonto September 8, 2022 01:50
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 8, 2022
@nak3
Copy link
Copy Markdown
Author

nak3 commented Sep 8, 2022

/cherry-pick release-v1.7

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Sep 8, 2022

@nak3: once the present PR merges, I will cherry-pick it on top of release-v1.7 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-v1.7

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.

mgencur
mgencur reviewed Sep 8, 2022
View reviewed changes
Comment thread openshift/ci-operator/update-ci.sh Outdated
$CURDIR/generate-ci-config.sh knative-$VERSION 4.9 true false > ${CONFIG}__49.yaml
$CURDIR/generate-ci-config.sh knative-$VERSION 4.10 true false > ${CONFIG}__410.yaml
$CURDIR/generate-ci-config.sh knative-$VERSION 4.11 true false true > ${CONFIG}__411-tls.yaml
$CURDIR/generate-ci-config.sh knative-$VERSION 4.11 true false true > ${CONFIG}__tls.yaml
Copy link
Copy Markdown

@mgencur mgencur Sep 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see my comment at openshift/release#32080 (comment)
I think we don't need this file ${CONFIG}__tls.yaml

mgencur
mgencur reviewed Sep 8, 2022
View reviewed changes
Comment thread openshift/ci-operator/update-ci.sh
$CURDIR/generate-ci-config.sh knative-$VERSION 4.10 true false > ${CONFIG}__410.yaml
$CURDIR/generate-ci-config.sh knative-$VERSION 4.11 true false true > ${CONFIG}__411-tls.yaml
$CURDIR/generate-ci-config.sh knative-$VERSION 4.11 false true true > ${CONFIG}__411.yaml

Copy link
Copy Markdown

@mgencur mgencur Sep 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's looking better now. But 4.10 is completely missing here.
According to https://docs.google.com/document/d/1s0UrrCDh3b7TrqbKU0X7D62L7AccyxqtjfoxeiZ2vXo/edit#heading=h.btnn1nimzwdy the Serverless 1.25 release should still support 4.6 but Serverless 1.26 will support OCP 4.8 and newer.
I'm wondering if you want to drop 4.6, 4.7 from here and add 4.10 back.
On a general note. It might be sufficient to test on the oldest and newest. So, in theory having 4.8 and 4.11 should be sufficient. But I will leave it to you. Testing all versions from 4.6 to 4.11 sounds like an overkill.
WDYT?

Copy link
Copy Markdown
Author

@nak3 nak3 Sep 8, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, sounds good to me. Updated.
I will update https://github.com/openshift/release later.

@mgencur
Copy link
Copy Markdown

mgencur commented Sep 8, 2022

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2022
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Sep 8, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mgencur, nak3

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

The pull request process is described here

Details 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 a9da0e6 into openshift:main Sep 8, 2022
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 8, 2022
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Sep 8, 2022

@nak3: new pull request created: #1241

Details

In response to this:

/cherry-pick release-v1.7

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.

@mgencur mgencur mentioned this pull request Sep 8, 2022
Merged
@nak3
Copy link
Copy Markdown
Author

nak3 commented Sep 9, 2022

/cherry-pick release-v1.5
/cherry-pick release-v1.6

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Sep 9, 2022

@nak3: #1239 failed to apply on top of branch "release-v1.5":

Applying: Update update-ci.sh
Using index info to reconstruct a base tree...
M	openshift/ci-operator/update-ci.sh
Falling back to patching base and 3-way merge...
Auto-merging openshift/ci-operator/update-ci.sh
CONFLICT (content): Merge conflict in openshift/ci-operator/update-ci.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update update-ci.sh
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick release-v1.5
/cherry-pick release-v1.6

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.

@nak3
Copy link
Copy Markdown
Author

nak3 commented Sep 9, 2022

/cherry-pick release-v1.6

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Sep 9, 2022

@nak3: #1239 failed to apply on top of branch "release-v1.6":

Applying: Update update-ci.sh
Using index info to reconstruct a base tree...
M	openshift/ci-operator/update-ci.sh
Falling back to patching base and 3-way merge...
Auto-merging openshift/ci-operator/update-ci.sh
CONFLICT (content): Merge conflict in openshift/ci-operator/update-ci.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update update-ci.sh
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick release-v1.6

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.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@skonto skonto Awaiting requested review from skonto

1 more reviewer

@mgencur mgencur mgencur left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@mgencur mgencur

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nak3 @openshift-cherrypick-robot @mgencur @openshift-merge-robot