Catch error in packagin script and fail the build#2627
Merged
yadvr merged 1 commit intoapache:masterapache/cloudstack:masterfrom May 9, 2018
khos2ow:catch-packaging-errorkhos2ow/cloudstack:catch-packaging-errorCopy head branch name to clipboard
Merged
Catch error in packagin script and fail the build#2627yadvr merged 1 commit intoapache:masterapache/cloudstack:masterfrom khos2ow:catch-packaging-errorkhos2ow/cloudstack:catch-packaging-errorCopy head branch name to clipboard
yadvr merged 1 commit intoapache:masterapache/cloudstack:masterfrom
khos2ow:catch-packaging-errorkhos2ow/cloudstack:catch-packaging-errorCopy head branch name to clipboard
Conversation
yadvr
reviewed
May 5, 2018
packaging/package.sh
Outdated
| echo "RPM Build Failed " | ||
| exit 3 | ||
| else | ||
| (cd $PWD/../; git reset --hard) |
Member
There was a problem hiding this comment.
Should the git reset --hard be part of the packaging script at all?
Contributor
Author
There was a problem hiding this comment.
Technically yes, because if --use-timestamp is used actual POM versions are changed and to leave the working directory in pristine state it's needed.
Member
There was a problem hiding this comment.
I would prefer to remove it, especially if someone is working on their feature/bugfix branch it risks removing changes (and losing code).
Contributor
Author
There was a problem hiding this comment.
That's actually a good point, I'll add an extra if condition around it later.
27fc4d1 to
0a5ef3a
Compare
| (cd "$RPMDIR"; rpmbuild --define "_topdir ${RPMDIR}" "${DEFVER}" "${DEFFULLVER}" "${DEFREL}" ${DEFPRE+"$DEFPRE"} ${DEFOSSNOSS+"$DEFOSSNOSS"} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec) | ||
| (cd $PWD/../; git reset --hard) | ||
| if [ $? -ne 0 ]; then | ||
| if [ "$USE_TIMESTAMP" == "true" ]; then |
Member
There was a problem hiding this comment.
What is the default of USE_TIMESTAMP? false?
Contributor
Author
There was a problem hiding this comment.
Yes, defined on line 185.
rafaelweingartner
approved these changes
May 8, 2018
This is to fix the regression added in apache#2433. In this fix we're going to fail the build early if --use-timestamp is provided and working directory is *not* clean.
0a5ef3a to
38f74ac
Compare
Contributor
|
@blueorangutan package |
|
@borisstoyanov a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. |
|
Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2032 |
yadvr
approved these changes
May 9, 2018
12 tasks
RodrigoDLopez
pushed a commit
to RodrigoDLopez/cloudstack
that referenced
this pull request
May 25, 2020
CLOUDSTACK-10268: Fix and enhance package script (apache#2433) - new flag `-T, --use-timestamp` to use `timestamp` when POM version contains SNAPSHOT - in the final artifacts (jar) name - in the final package (rpm, deb) name - in `/etc/cloudstack-release` file of SystemVMs - in the Management Server > About dialog - if there's a "branding" string in the POM version (e.g. `x.y.z.a-NAME[-SNAPSHOT]`), the branding name will be used in the final generated pacakge name such as following: - `cloudstack-management-x.y.z.a-NAME.NUMBER.el7.centos.x86_64` - `cloudstack-management_x.y.z.a-NAME-NUMBER~xenial_all.deb` - branding string can be overriden with newly added `-b, --brand` flag - handle the new format version for VR version - fix long opts (they were broken) - tolerate and show a warning message for unrecognized flags - usage help reformat * Deprecate Version class in favor or CloudStackVersion CLOUDSTACK-10268: Fix typo (apache#2495) This fixes typo introduced in PR apache#2433 packaging: Catch error in packaging script and fail the build (apache#2627) This is to fix the regression added in apache#2433. In this fix we're going to fail the build early if --use-timestamp is provided and working directory is *not* clean. chrry pick packaging: Catch error in packaging script and fail the build (apache#2627) This is to fix the regression added in apache#2433. In this fix we're going to fail the build early if --use-timestamp is provided and working directory is *not* clean. fix patch delete unused files
RodrigoDLopez
pushed a commit
to RodrigoDLopez/cloudstack
that referenced
this pull request
May 25, 2020
CLOUDSTACK-10268: Fix and enhance package script (apache#2433) - new flag `-T, --use-timestamp` to use `timestamp` when POM version contains SNAPSHOT - in the final artifacts (jar) name - in the final package (rpm, deb) name - in `/etc/cloudstack-release` file of SystemVMs - in the Management Server > About dialog - if there's a "branding" string in the POM version (e.g. `x.y.z.a-NAME[-SNAPSHOT]`), the branding name will be used in the final generated pacakge name such as following: - `cloudstack-management-x.y.z.a-NAME.NUMBER.el7.centos.x86_64` - `cloudstack-management_x.y.z.a-NAME-NUMBER~xenial_all.deb` - branding string can be overriden with newly added `-b, --brand` flag - handle the new format version for VR version - fix long opts (they were broken) - tolerate and show a warning message for unrecognized flags - usage help reformat * Deprecate Version class in favor or CloudStackVersion CLOUDSTACK-10268: Fix typo (apache#2495) This fixes typo introduced in PR apache#2433 packaging: Catch error in packaging script and fail the build (apache#2627) This is to fix the regression added in apache#2433. In this fix we're going to fail the build early if --use-timestamp is provided and working directory is *not* clean. packaging: Catch error in packaging script and fail the build (apache#2627) This is to fix the regression added in apache#2433. In this fix we're going to fail the build early if --use-timestamp is provided and working directory is *not* clean. fix patch delete unused files create version 4.11.3.0-scclouds1
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR is going to:
--use-timestampis provided and working directory is not clean.Types of changes
GitHub Issue/PRs
Screenshots (if appropriate):
How Has This Been Tested?
Checklist:
Testing