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

GEODE-5600: Add build property skipVersionFileRegeneration #2349

Merged
merged 10 commits into from Aug 22, 2018

Conversation

PurelyApplied
Copy link
Member

  • Set this property to be true if the "devBuild" target is run.
  • This property is only honored if the property file already exists.

Co-authored-by: Sean Goller sgoller@pivotal.io


Version file regeneration can be skipped via either of the following:

$> ./gradlew devBuild

$> ./gradlew assemble -PskipVersionFileRegeneration

This is preferred over -x createVersionPropertiesFile as this approach can cause issues if the file does not already exist.


Thank you for submitting a contribution to Apache Geode.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?

  • Has your PR been rebased against the latest commit within the target branch (typically develop)?

  • Is your initial contribution a single, squashed commit?

  • Does gradlew build run cleanly?

  • Have you written or updated unit tests to verify your changes?

  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?

Note:

Please ensure that once the PR is submitted, you check travis-ci for build issues and
submit an update to your PR as soon as possible. If you need help, please send an
email to dev@geode.apache.org.

* Set this property to be true if the "devBuild" target is run.
* This property is only honored if the property file already exists.

Co-authored-by: Sean Goller <sgoller@pivotal.io>
@PurelyApplied
Copy link
Member Author

Copy link
Contributor

@jake-at-work jake-at-work left a comment

Choose a reason for hiding this comment

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

I recall the intent was to have dev builds use “0” or some other value for the SHA at configure and that CI builds would pass the SHA as a project property like it does for versions.

@PurelyApplied
Copy link
Member Author

A full pipeline deployment went green on staging, excepting categoric failures on Windows*Test jobs due to existing iteration against that infrastructure.

Copy link
Contributor

@dickcav dickcav left a comment

Choose a reason for hiding this comment

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

Looks good!

@@ -70,12 +70,14 @@ pushd ${GEODE_BUILD}
echo "Running tests"
set -x

SCM_PROPS="-PsourceRevision=\"$(git rev-parse HEAD)\" -PsourceRepository=\"${SOURCE_REPOSITORY}\""
Copy link
Contributor

Choose a reason for hiding this comment

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

We don't need to set these on Windows or any of the other test scripts since we don't ship the tested binaries.

@@ -68,13 +68,15 @@ if [ -v CALL_STACK_TIMEOUT ]; then
ssh -i ${SSHKEY_FILE} geode@${INSTANCE_IP_ADDRESS} "tmux new-session -d -s callstacks; tmux send-keys ~/capture-call-stacks.sh\ ${PARALLEL_DUNIT}\ ${CALL_STACK_TIMEOUT} C-m"
fi

SCM_PROPS="-PsourceRevision=\"$(cd geode; git rev-parse HEAD)\" -PsourceRepository=\"${SOURCE_REPOSITORY}\""
Copy link
Contributor

Choose a reason for hiding this comment

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

Does not need to be set on test builds since we don't ship the tested build.

Copy link
Member Author

Choose a reason for hiding this comment

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

The file is still consumed in tests, though. And on that front, we want to test exactly what we would be shipping, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

Jake is correct in principle but as a developer if I download test artifacts from the pipeline I want to be able to see the repo and sha those tests were run on and not just rely on the build number. IMHO we need these for consistency across the build and test tasks as done historically.

@dickcav dickcav merged commit 98a0b7d into apache:develop Aug 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants