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

Bug 1843342: Get RPM and Kuryr version from git #267

Merged
merged 1 commit into from Jun 9, 2020

Conversation

dulek
Copy link
Contributor

@dulek dulek commented Jun 5, 2020

This commit makes sure we're getting the version to use as RPM and
Python package semver from the last tag in git. This should solve issue
of kuryr-k8s-controller --version returning 0.0.0 and remove the need
to update versions in various places each time master gets opened to new
release development.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 5, 2020
@dulek dulek force-pushed the test-rpm-version branch 8 times, most recently from 3c26b42 to dd625a0 Compare June 8, 2020 17:36
@dulek dulek changed the title Test RPM version Get RPM and Kuryr version from git Jun 8, 2020
@dulek dulek changed the title Get RPM and Kuryr version from git Bug 1843342: Get RPM and Kuryr version from git Jun 9, 2020
@openshift-ci-robot
Copy link

@dulek: This pull request references Bugzilla bug 1843342, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1843342: Get RPM and Kuryr version from git

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.

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Jun 9, 2020
@dulek
Copy link
Contributor Author

dulek commented Jun 9, 2020

/hold

Still need to check if this helps with OCP builds too.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 9, 2020
@dulek dulek force-pushed the test-rpm-version branch 2 times, most recently from 6621502 to d796a9d Compare June 9, 2020 08:30
@dulek
Copy link
Contributor Author

dulek commented Jun 9, 2020

/hold cancel

Alright, this should help.

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 9, 2020
@dulek
Copy link
Contributor Author

dulek commented Jun 9, 2020

/hold

One more idea of an improvement.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 9, 2020
This commit makes sure we're getting the version to use as RPM and
Python package semver from the last tag in git. This should solve issue
of `kuryr-k8s-controller --version` returning 0.0.0 and remove the need
to update versions in various places each time master gets opened to new
release development.

Change-Id: I5f2d56e1cdad6dace4c456ee7a6ff34f57a02b5d
@dulek
Copy link
Contributor Author

dulek commented Jun 9, 2020

/hold cancel

Alright, that should work in OCP too, needed to double-check this.

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 9, 2020
@MaysaMacedo
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dulek, MaysaMacedo

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

@dulek
Copy link
Contributor Author

dulek commented Jun 9, 2020

/test images

Looks like job got stuck for some reason?

@dulek dulek closed this Jun 9, 2020
@dulek dulek reopened this Jun 9, 2020
@openshift-ci-robot
Copy link

@dulek: This pull request references Bugzilla bug 1843342. The bug has been updated to no longer refer to the pull request using the external bug tracker.

In response to this:

Bug 1843342: Get RPM and Kuryr version from git

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.

@openshift-ci-robot
Copy link

@dulek: This pull request references Bugzilla bug 1843342, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1843342: Get RPM and Kuryr version from git

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.

@dulek
Copy link
Contributor Author

dulek commented Jun 9, 2020

Aww, misclick, I'm not touching this again. :D

@openshift-merge-robot openshift-merge-robot merged commit da60b9e into openshift:master Jun 9, 2020
@openshift-ci-robot
Copy link

@dulek: All pull requests linked via external trackers have merged: openshift/kuryr-kubernetes#267. Bugzilla bug 1843342 has been moved to the MODIFIED state.

In response to this:

Bug 1843342: Get RPM and Kuryr version from git

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.

@dulek
Copy link
Contributor Author

dulek commented Jun 10, 2020

/cherry-pick release-4.5

@openshift-cherrypick-robot

@dulek: #267 failed to apply on top of branch "release-4.5":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	openshift-kuryr-kubernetes-rhel8.spec
M	tools/build-rpm-rhel8.sh
Falling back to patching base and 3-way merge...
Auto-merging tools/build-rpm-rhel8.sh
CONFLICT (content): Merge conflict in tools/build-rpm-rhel8.sh
Auto-merging openshift-kuryr-kubernetes-rhel8.spec
CONFLICT (content): Merge conflict in openshift-kuryr-kubernetes-rhel8.spec
Patch failed at 0001 Get RPM and Kuryr version from git

In response to this:

/cherry-pick release-4.5

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 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. bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. 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

5 participants