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

Fixes #18311: Changes to rudder package command to improve plugin management #3250

Merged
merged 1 commit into from Oct 21, 2020
Merged

Fixes #18311: Changes to rudder package command to improve plugin management #3250

merged 1 commit into from Oct 21, 2020

Conversation

VinceMacBuche
Copy link
Member

@VinceMacBuche
Copy link
Member Author

PR updated with a new commit

@VinceMacBuche
Copy link
Member Author

PR updated with a new commit

@VinceMacBuche VinceMacBuche changed the base branch from branches/rudder/6.1 to branches/rudder/6.2 October 9, 2020 09:48
@amousset
Copy link
Member

Contains unrelated changes (source package handling in inventories)

@VinceMacBuche
Copy link
Member Author

PR updated with a new commit

@VinceMacBuche VinceMacBuche force-pushed the bug_18311/changes_to_rudder_package_command_to_improve_plugin_management branch from 927eb9a to 182b6a4 Compare October 21, 2020 09:11
@VinceMacBuche
Copy link
Member Author

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/3250
-- Your faithful QA
Kant merge: "Thoughts without content are empty, intuitions without concepts are blind."
(https://ci.normation.com/jenkins/job/merge-accepted-pr/31319/console)

@VinceMacBuche
Copy link
Member Author

OK, squash merging this PR

@VinceMacBuche VinceMacBuche force-pushed the bug_18311/changes_to_rudder_package_command_to_improve_plugin_management branch from 04459bd to ce7e93c Compare October 21, 2020 11:58
@Normation-Quality-Assistant
Copy link
Contributor

This PR breaks qa-test

-- stdout -- 
Branch 'branches/rudder/6.2' set up to track remote branch 'branches/rudder/6.2' from 'NRM'.
Your branch is up to date with 'NRM/branches/rudder/6.2'.
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 '!' -wholename '*jsondiff/*' -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/3250 --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/31325/console)

@VinceMacBuche VinceMacBuche force-pushed the bug_18311/changes_to_rudder_package_command_to_improve_plugin_management branch from 4ead5eb to f0b560d Compare October 21, 2020 19:29
@Normation-Quality-Assistant
Copy link
Contributor

OK, merging this PR

@Normation-Quality-Assistant Normation-Quality-Assistant merged commit f0b560d into Normation:branches/rudder/6.2 Oct 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amousset amousset amousset approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@VinceMacBuche @amousset @Normation-Quality-Assistant