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 #12357: Port sshKeyDistribution to multiversionned technique #1339

Merged
merged 2 commits into from
Dec 17, 2018
Merged

Fixes #12357: Port sshKeyDistribution to multiversionned technique #1339

merged 2 commits into from
Dec 17, 2018

Conversation

ncharles
Copy link
Member

amousset
amousset reviewed Aug 29, 2018
View reviewed changes
techniques/system/common/1.0/hooks.st Outdated
ifvarclass => "post_hook_flush_ssh_${${bundles}.sshkey_distribution_name[${array[${bundles}]}]}_error.!post_hook_flush_ssh_${${bundles}.sshkey_distribution_name[${array[${bundles}]}]}_repaired";


# Finallly, a key in audit mode was not compliant. We won't try to flush, as the result is unexpected
Copy link
Member

Choose a reason for hiding this comment

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

Finally

@ncharles ncharles force-pushed the ust_12357/port_sshkeydistribution_to_multiversionned_technique branch from 7f24851 to 1c4e42a Compare August 30, 2018 10:39
@ncharles
Copy link
Member Author

Commit modified

@ncharles ncharles force-pushed the ust_12357/port_sshkeydistribution_to_multiversionned_technique branch from 1c4e42a to d114936 Compare August 30, 2018 13:01
@ncharles
Copy link
Member Author

Commit modified

@Normation-Quality-Assistant
Copy link
Contributor

This PR breaks qa-test

-- stdout -- 
Branch 'branches/rudder/4.3' set up to track remote branch 'branches/rudder/4.3' from 'NRM'.
Your branch is up to date with 'NRM/branches/rudder/4.3'.
Already up to date.
Already up to date.
[...]

-- stderr --
From github.com:ncharles/rudder-techniques
 * [new branch]        ust_12357/port_sshkeydistribution_to_multiversionned_technique -> ust_12357/port_sshkeydistribution_to_multiversionned_technique_pr
From github.com:Normation/rudder-techniques
   a4d1caf1..c28fd4fa  master     -> NRM/master
Switched to branch 'branches/rudder/4.3'
Switched to a new branch '4.3_test'
make: *** [test] Error 1

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-techniques/pull/1339 --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/5186/console)

@ncharles ncharles force-pushed the ust_12357/port_sshkeydistribution_to_multiversionned_technique branch from d114936 to c85e0c6 Compare December 17, 2018 10:28
@ncharles
Copy link
Member Author

Commit modified

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

@ncharles
Copy link
Member Author

OK, merging this PR

@ncharles ncharles merged commit c85e0c6 into Normation:branches/rudder/4.3 Dec 17, 2018
@ncharles
Copy link
Member Author

OK, merging this PR

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
qa: Can't merge
Projects
None yet
Milestone
No milestone
3 participants
@ncharles @Normation-Quality-Assistant @amousset