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

Fixes #17600: rudder package logs are inconsistent #3038

Conversation

Fdall
Copy link
Contributor

@Fdall Fdall commented Jun 3, 2020

@Fdall Fdall requested a review from peckpeck June 3, 2020 14:47
@Normation-Quality-Assistant
Copy link
Contributor

This PR breaks qa-test

-- stdout -- 
Branch 'branches/rudder/6.0' set up to track remote branch 'branches/rudder/6.0' from 'NRM'.
Your branch is up to date with 'NRM/branches/rudder/6.0'.
Already up to date.
Already up to date.
[...]
+ '[' --merge = --relayd ']'
+ '[' --merge = --language ']'
+ '[' --merge = --scala ']'
+ webapp/sources/rudder/rudder-core/src/test/resources/hooks.d/test-hooks.sh
+ export PYTHONPATH=./relay/sources/rudder-pkg/lib/rudder-pkg/:./relay/sources/rudder-pkg/lib:
+ PYTHONPATH=./relay/sources/rudder-pkg/lib/rudder-pkg/:./relay/sources/rudder-pkg/lib:
+ find . '!' -name convertOpenLDAPSchema.py -name '*.py'
+ xargs pylint -E --persistent=n --disable=C,R,import-error,no-member,no-name-in-module
No config file found, using default configuration

You should run ./qa-test in your repository to make sure it works.
You can also run rudder-dev merge https://github.com/Normation/rudder/pull/3038 --test to test with upmerging.
After this, you can remove the qa: Can't merge ta
-- Your faithful QA (https://ci.normation.com/jenkins/job/merge-accepted-pr/25724/console)

@Fdall
Copy link
Contributor Author

Fdall commented Jun 4, 2020

PR updated with a new commit

@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/rudder/pull/3038
-- Your faithful QA
Kant merge: "Live your life as though your every act were to become a universal law."
(https://ci.normation.com/jenkins/job/merge-accepted-pr/25731/console)

@Fdall
Copy link
Contributor Author

Fdall commented Jun 4, 2020

OK, squash merging this PR

@Fdall Fdall force-pushed the bug_17600/rudder_package_logs_are_inconsistent branch from cf44a05 to e845c46 Compare June 4, 2020 13:42
@Fdall Fdall merged commit e845c46 into Normation:branches/rudder/6.0 Jun 4, 2020
@Fdall
Copy link
Contributor Author

Fdall commented Jun 4, 2020

OK, merging this PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants