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

CI: travis: fix du -> df and capture it also directly from test #242

Merged
merged 2 commits into from
Dec 16, 2016

Conversation

jnpkrn
Copy link
Contributor

@jnpkrn jnpkrn commented Dec 12, 2016

No description provided.

@chrissie-c
Copy link
Contributor

What's the reasoning behind the "#if 1" in check_ipc.c?

@jnpkrn
Copy link
Contributor Author

jnpkrn commented Dec 12, 2016

It's conditionalizing part that perhaps someone will want to disable (e.g. downstream), for instance because the build/development environment also coincidentally exports CI environment variable and any byproduct is undesirable. Once we isolate and fix the original #234 issue, the whole bigger block should be dropped, but this is an extra convenience toggle for others to use.

@chrissie-c
Copy link
Contributor

If you want to make it 'semi-conditional' then can you please make a #define for it and check for that. #if 1 is just unhelpful.

@jnpkrn
Copy link
Contributor Author

jnpkrn commented Dec 12, 2016

OK, I have a better solution, but that requires #241 already merged as it also touches .travis.yml and would generate a merge conflict needlessly for that.

@jnpkrn
Copy link
Contributor Author

jnpkrn commented Dec 16, 2016

I piggybacked also unification of custom.py tito extension with what's currently in pacemaker (for ease of maintenance).

@chrissie-c chrissie-c merged commit 75345a0 into ClusterLabs:master Dec 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants