From 8cdd881cb88e2681b93c91c1bfd31dc3f4c6b0a2 Mon Sep 17 00:00:00 2001 From: Crola1702 Date: Mon, 13 Jan 2025 10:20:08 -0500 Subject: [PATCH] Use correct strategy in attributes and actually save the user Signed-off-by: Crola1702 --- recipes/jenkins.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipes/jenkins.rb b/recipes/jenkins.rb index 2e38857..bac5678 100644 --- a/recipes/jenkins.rb +++ b/recipes/jenkins.rb @@ -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.") @@ -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.* @@ -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