openshift-kni / cnf-features-deploy

Kustomize configs for installing CNF features and e2e functional tests for verifying feature deployment/integration
Apache License 2.0
57 stars 134 forks source link

infra: fixes branch to build the list of commits #1939

Closed rauhersu closed 2 months ago

rauhersu commented 2 months ago

These commits were merged in 4.16 and skipped the syntax verification:

1ccd7824 Revert "Add ClusterImageSet CR in the whitelist of policies-app-project" c8187edc Add ClusterImageSet CR in the whitelist of policies-app-project

They don't respect the component syntax defined on .githooks/components.sh so any posterior syntax verification makes commits fail Prow tests.

We need this hack to skip the syntax checking.

rauhersu commented 2 months ago

/cc @sabbir-47

sabbir-47 commented 2 months ago

/cc @lack

lack commented 2 months ago

Why are we checking the entire commit history? Shouldn't we just check the new pending commits?

rauhersu commented 2 months ago

/cc @lack

Jim, discarding my previous changes and fixing the branch to compare and build the commit list according to the branch we want to merge to.

lack commented 2 months ago

/approve

rauhersu commented 2 months ago

/assign @SchSeba

lack commented 2 months ago

/lgtm

rauhersu commented 2 months ago

/assign @SchSeba

Apologies for bothering you once again, Sebastian.

SchSeba commented 2 months ago

can we please have the 4.16 branch config in the openshift/release repo so we can have the CI lanes running here I just want to get the confidence that the lanes are green before we merge this PR

rauhersu commented 2 months ago

Thanks for commenting @SchSeba . Actually, the commit you are referring to was the reason to introduce this one, kind of a catch22: the release preparation for 4.16 fails to merge because this cnf-features-deploy test is failing. And, at the same time, we cannot run any test per MR here because we don't have that release preparation merged.

The reason to reach this status was that the 4.16 branch was available firstly and thus, commits were merged but illegitimately : as no presubmit job is currently run for 4.16 commits, they are being merged while tests shouldn't pass.

The 4.16 branch config we need to merge when this test is fixed was prepared here: https://github.com/openshift/release/pull/52175 and its current Prow report prevents it from being merged because of the test we are fixing here.

SchSeba commented 2 months ago

so let me first merge the release one and we can see the lanes running here

SchSeba commented 2 months ago

ok so all good here I will merge this one /lgtm /approve /override ci/prow/e2e-aws-ci-tests

openshift-ci[bot] commented 2 months ago

@SchSeba: Overrode contexts on behalf of SchSeba: ci/prow/e2e-aws-ci-tests

In response to [this](https://github.com/openshift-kni/cnf-features-deploy/pull/1939#issuecomment-2184941676): >ok so all good here I will merge this one >/lgtm >/approve >/override ci/prow/e2e-aws-ci-tests Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lack, rauhersu, SchSeba

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: - ~~[OWNERS](https://github.com/openshift-kni/cnf-features-deploy/blob/release-4.16/OWNERS)~~ [SchSeba] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
rauhersu commented 2 months ago

/cherry-pick master

openshift-cherrypick-robot commented 2 months ago

@rauhersu: new pull request created: #1955

In response to [this](https://github.com/openshift-kni/cnf-features-deploy/pull/1939#issuecomment-2194802561): >/cherry-pick master > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.