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 #19136: Delay remote trigger on change #3580

Conversation

peckpeck
Copy link
Member

@peckpeck peckpeck commented Apr 8, 2021

Copy link
Member

@amousset amousset left a comment

Choose a reason for hiding this comment

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

missing fi

@Normation-Quality-Assistant
Copy link
Contributor

This PR breaks qa-test

-- stdout -- 
Branch 'branches/rudder/6.1' set up to track remote branch 'branches/rudder/6.1' from 'NRM'.
Your branch is up to date with 'NRM/branches/rudder/6.1'.
Already up to date.
Already up to date.
[...]
From github.com:peckpeck/rudder
 * [new branch]          bug_19136/delay_remote_trigger_on_change -> bug_19136/delay_remote_trigger_on_change_pr
Switched to branch 'branches/rudder/6.1'
Switched to a new branch '6.1_test'
+ '[' --merge = --relayd ']'
+ '[' --merge = --language ']'
+ '[' --merge = --scala ']'
+ webapp/sources/rudder/rudder-core/src/test/resources/hooks.d/test-hooks.sh
././webapp/sources/rudder/rudder-core/src/main/resources/hooks.d/policy-generation-finished/60-trigger-node-update: line 75: syntax error near unexpected token `fi'

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/3580 --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/37487/console)

@peckpeck
Copy link
Member Author

peckpeck commented Apr 9, 2021

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/3580
-- 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/37489/console)

@peckpeck
Copy link
Member Author

OK, squash merging this PR

@peckpeck peckpeck force-pushed the bug_19136/delay_remote_trigger_on_change branch from 0a28bdd to b9a2304 Compare April 10, 2021 11:40
@peckpeck
Copy link
Member Author

OK, merging this PR

@peckpeck peckpeck merged commit b9a2304 into Normation:branches/rudder/6.1 Apr 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants