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

Remove extraneous CHANGELOGS on the 1.10 branch. #59960

Merged

Conversation

david-mcmahon
Copy link
Contributor

@david-mcmahon david-mcmahon commented Feb 16, 2018

What this PR does / why we need it:

Initial change on a new branch so we can tag a commit that doesn't exist on master.

This normally happens during the course of a release, automatically via anago. This provides an opportunity here to fix the issue at branch time, described in detail below.

ref kubernetes/sig-release#85

@k8s-ci-robot
Copy link
Contributor

@david-mcmahon: Adding do-not-merge/release-note-label-needed because the release note process has not been followed.

One of the following labels is required "release-note", "release-note-action-required", or "release-note-none".
Please see: https://git.k8s.io/community/contributors/devel/pull-requests.md#write-release-notes-if-needed.

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.

@k8s-ci-robot k8s-ci-robot added retest-not-required-docs-only size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 16, 2018
@david-mcmahon david-mcmahon added the release-note-none Denotes a PR that doesn't merit a release note. label Feb 16, 2018
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Feb 16, 2018
@k8s-ci-robot k8s-ci-robot removed the release-note-none Denotes a PR that doesn't merit a release note. label Feb 16, 2018
Copy link
Member

@enisoc enisoc left a comment

Choose a reason for hiding this comment

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

LGTM but I'll defer to @calebamiles to add the lgtm label.

@calebamiles
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 21, 2018
@calebamiles
Copy link
Contributor

/retest

@calebamiles
Copy link
Contributor

/approve

@calebamiles calebamiles added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Feb 21, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: calebamiles, david-mcmahon

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

@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Feb 21, 2018
@calebamiles calebamiles added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Feb 21, 2018
@calebamiles
Copy link
Contributor

/retest

@david-mcmahon david-mcmahon added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Feb 21, 2018
@ixdy
Copy link
Member

ixdy commented Feb 21, 2018

@cjwagner tests above are failing with

I0221 17:06:45.141] Call:  /workspace/./test-infra/jenkins/../scenarios/kubernetes_verify.py --branch=release-1.10 --prow
W0221 17:06:45.167] Traceback (most recent call last):
W0221 17:06:45.168]   File "/workspace/./test-infra/jenkins/../scenarios/kubernetes_verify.py", line 170, in <module>
W0221 17:06:45.168]     main(ARGS.branch, ARGS.script, ARGS.force, ARGS.prow)
W0221 17:06:45.168]   File "/workspace/./test-infra/jenkins/../scenarios/kubernetes_verify.py", line 94, in main
W0221 17:06:45.169]     tag = VERSION_TAG[BRANCH_VERSION.get(ver, ver)]
W0221 17:06:45.169] KeyError: '1.10'
E0221 17:06:45.169] Command failed

@calebamiles
Copy link
Contributor

total speculation that kubernetes/test-infra#6919 would fix the above test failure. Better question is why this works for 1.9

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@calebamiles
Copy link
Contributor

/retest

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit 48b7bb5 into kubernetes:release-1.10 Feb 21, 2018
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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants