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.

Sign up for GitHub

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

Jump to bottom

Moved shared init code into hack/lib/init.sh #10300

Merged
merged 1 commit into from
Aug 12, 2016
Merged

Moved shared init code into hack/lib/init.sh #10300

merged 1 commit into from
Aug 12, 2016

Conversation

stevekuznetsov
Copy link
Contributor

All of our Bash scripts made a number of initialization
steps: setting Bash flags, finding and moving into the
Origin root directory. This commit moves all of those
steps into hack/lib/init.sh in order to cut down on the
amount of boilerplate in our files.

Signed-off-by: Steve Kuznetsov [email protected]

@stevekuznetsov
Copy link
Contributor Author

[test]

@stevekuznetsov
Copy link
Contributor Author

@Miciah would you please look at this and let me know if it looks good?

@stevekuznetsov
Copy link
Contributor Author

Extended test hit a bunch of flakes but the Bash worked fine.

eparis
eparis reviewed Aug 10, 2016
View reviewed changes
hack/godep-save.sh
@@ -43,6 +38,4 @@ REQUIRED_BINS=(
"./..."
)

pushd "${ORIGIN_ROOT}" > /dev/null
Copy link
Member

Choose a reason for hiding this comment

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

now the script will fail if I'm not running from the root?

Copy link
Contributor Author

@stevekuznetsov stevekuznetsov Aug 10, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

As of this commit, hack/lib/init.sh will ensure you're in the root after you source it so these statements were superfluous.

@eparis
Copy link
Member

eparis commented Aug 10, 2016

this LGTM. I'll give it a merge after tests...

@stevekuznetsov
Copy link
Contributor Author

@eparis unclear how much weight we should give the tests. test_pull_requests_origin passed earlier, the extended stuff is going to flake until the cows come home at this rate. No Bash errors happened in either job, though.

@stevekuznetsov
Copy link
Contributor Author

Green test_pull_requests, which touches most if not all of these files. I've done another pass and everything looks good. [merge]

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 10, 2016
@stevekuznetsov
Copy link
Contributor Author

Rebased, re[merge]

@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 10, 2016
@stevekuznetsov
Copy link
Contributor Author

stevekuznetsov commented Aug 11, 2016 •
edited
Loading

@openshift-bot, the last build failed from the following flakes:

@stevekuznetsov
Copy link
Contributor Author

re[merge]

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 12, 2016
@stevekuznetsov
Moved shared init code into hack/lib/init.sh
614bf6c 
All of our Bash scripts made a number of initialization
steps: setting Bash flags, finding and moving into the
Origin root directory. This commit moves all of those
steps into hack/lib/init.sh in order to cut down on the
amount of boilerplate in our files.

Signed-off-by: Steve Kuznetsov <[email protected]>
@stevekuznetsov
Copy link
Contributor Author

rebased, re[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 614bf6c

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/7845/)

@stevekuznetsov stevekuznetsov removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 12, 2016
@openshift-bot
Copy link
Contributor

openshift-bot commented Aug 12, 2016 •
edited
Loading

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/7845/) (Image: devenv-rhel7_4814)

@stevekuznetsov
Copy link
Contributor Author

@openshift-bot, the last build failed from the following flakes:

re[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 614bf6c

@openshift-bot openshift-bot merged commit 644b23e into openshift:master Aug 12, 2016
@stevekuznetsov stevekuznetsov mentioned this pull request Aug 12, 2016
Merged
@stevekuznetsov stevekuznetsov deleted the skuznets/better-init branch January 31, 2017 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@stevekuznetsov @eparis @openshift-bot