Skip to content

Commit

Permalink
Use correct strategy in attributes and actually save the user
Browse files Browse the repository at this point in the history
Signed-off-by: Crola1702 <[email protected]>
  • Loading branch information
Crola1702 committed Jan 13, 2025
1 parent 256fd59 commit 8cdd881
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions recipes/jenkins.rb
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
group 'jenkins'
end

if node['ros_buildfarm']['jenkins']['auth_strategy'] == 'groovy'
if node.default['ros_buildfarm']['jenkins']['auth_strategy'] == 'groovy'
auth_strategy_script = data_bag_item('ros_buildfarm_jenkins_scripts', 'auth_strategy')[node.chef_environment]
if auth_strategy_script.nil?
Chef::Log.fatal("No auth strategy script for #{node.chef_environment} in ros_buildfarm_jenkins_scripts but auth_strategy is set to groovy.")
Expand All @@ -178,9 +178,7 @@
owner 'jenkins'
group 'jenkins'
end

elsif node['ros_buildfarm']['jenkins']['auth_strategy'] == 'default'
## TODO: (Crola1702) CHANGEME: cli to run groovy scripts
elsif node.default['ros_buildfarm']['jenkins']['auth_strategy'] == 'default'
default_auth_script = <<~GROOVY
import hudson.model.*
import jenkins.model.*
Expand Down Expand Up @@ -239,6 +237,7 @@ def jenkins = Jenkins.getInstance()
user.addProperty(password)
keys = new org.jenkinsci.main.modules.cli.auth.ssh.UserPropertyImpl(#{user['public_keys'].join('\n')})
user.addProperty(keys)
user.save()
GROOVY

users_creation_scripts << user_creation_script
Expand Down

0 comments on commit 8cdd881

Please sign in to comment.