From 0b569b41d8938dde8b184164ae6dce84c13e120c Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Thu, 26 Jun 2014 09:47:50 -0700 Subject: [PATCH] Set the private_key after authentication is enabled --- .../cookbooks/authentication/recipes/default.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/fixtures/cookbooks/authentication/recipes/default.rb b/test/fixtures/cookbooks/authentication/recipes/default.rb index 02fbd41767..6f0aa4963d 100644 --- a/test/fixtures/cookbooks/authentication/recipes/default.rb +++ b/test/fixtures/cookbooks/authentication/recipes/default.rb @@ -21,11 +21,6 @@ public_keys [public_key] end -# Set the private key on the executor -ruby_block 'set the private key' do - block { node.run_state[:jenkins_private_key] = private_key } -end - # Turn on basic authentication jenkins_script 'setup authentication' do command <<-EOH.gsub(/^ {4}/, '') @@ -43,6 +38,11 @@ def strategy = new hudson.security.FullControlOnceLoggedInAuthorizationStrategy( EOH end +# Set the private key on the executor +ruby_block 'set the private key' do + block { node.run_state[:jenkins_private_key] = private_key } +end + # Run some commands - this will ensure the CLI is correctly passing attributes jenkins_command 'clear-queue'