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

[v2.2] Cirrus: Fix running Validate task on branches #9324

Merged
merged 1 commit into from
Feb 22, 2021

Conversation

cevich
Copy link
Member

@cevich cevich commented Feb 11, 2021

Followup to 6917272

Despite skipping the Smoke check, it was observed on a new branch,
the validate task (specifically git-validation) will fail. This
is because:

  • $CIRRUS_LAST_GREEN_CHANGE will be empty on a new branch.
  • $CIRRUS_BASE_SHA is always empty for runs triggered by branch-push
  • $EPOCH_TEST_COMMIT will be set to YOU_FOUND_A_BUG.

Fix this by eliminating the Smoke task entirely, simplifying all
the make validate operations into the validate cirrus task. Ensure
this task does not run when a new branch or tag is pushed.

Also, eliminate the $CIRRUS_BUILD_ID value as it's confusing and not
actually used anywhere. It was formerly used for building VM images,
but this has moved to another repo entirely.

Signed-off-by: Chris Evich [email protected]

Followup to 6917272

Despite skipping the `Smoke` check, it was observed on a *new* branch,
the `validate` task (specifically `git-validation`) will fail.  This
is because:

* `$CIRRUS_LAST_GREEN_CHANGE` will be empty on a new branch.
* `$CIRRUS_BASE_SHA` is always empty for runs triggered by branch-push
* `$EPOCH_TEST_COMMIT` will be set to `YOU_FOUND_A_BUG`.

Fix this by eliminating the `Smoke` task entirely, simplifying all
the `make validate` operations into the `validate` cirrus task.  Ensure
this task does not run when a new branch or tag is pushed.

Also, eliminate the `$CIRRUS_BUILD_ID` value as it's confusing and not
actually used anywhere.  It was formerly used for building VM images,
but this has moved to another repo entirely.

Signed-off-by: Chris Evich <[email protected]>
@cevich cevich requested review from edsantiago and rhatdan February 11, 2021 18:04
@cevich
Copy link
Member Author

cevich commented Feb 11, 2021

Ref. failed branch-job: https://cirrus-ci.com/task/4775235637477376

@cevich cevich changed the title Cirrus: Fix running Validate task on branches [v2.2] Cirrus: Fix running Validate task on branches Feb 11, 2021
@rhatdan
Copy link
Member

rhatdan commented Feb 12, 2021

@edsantiago PTAL

@edsantiago
Copy link
Member

This is really difficult to review. I did so by eyeballing against #9063 and (manually) verifying that the changes look the same; I also ran git cdif master .cirrus.yml and confirmed that the diffs are in sections unrelated to this PR (i.e., only in other places where master has drifted). git cdif on the other files produced way too much output for me to be able to review sanely. I will just trust that this was an automated cherry-pick and that you would've mentioned if there were significant conflicts or reconciliations.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 22, 2021
@rhatdan rhatdan added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 22, 2021
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: cevich

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 c0ab432 into containers:v2.2 Feb 22, 2021
@cevich
Copy link
Member Author

cevich commented Feb 22, 2021

this was an automated cherry-pick

Yes it was.

@cevich cevich deleted the v2.2_replace_smoke branch June 30, 2021 18:08
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants