From 8a2ea596b4b65c7e6e10fbba8adfbb26b4c4b2e8 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Sun, 11 Jun 2017 16:04:25 +0200 Subject: [PATCH] Don't overwrite jenkins user authorized keys Our CI has a real jenkins user that needs to be able to SSH to nodes in order to copy logs, so don't overwrite its authorized keys file. We can still test everything else about the jenkinsuser class. Change-Id: I766f9992359a19277eda94f59835a0c9263e540a --- spec/acceptance/fixtures/master.pp | 4 +--- spec/acceptance/fixtures/slave.pp | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/spec/acceptance/fixtures/master.pp b/spec/acceptance/fixtures/master.pp index 70d1ad8..b2d3b63 100644 --- a/spec/acceptance/fixtures/master.pp +++ b/spec/acceptance/fixtures/master.pp @@ -1,6 +1,4 @@ -class { '::jenkins::jenkinsuser': - ssh_key => 'sshkey', -} +class { '::jenkins::jenkinsuser': } class { '::jenkins::master': vhost_name => '127.0.0.1', diff --git a/spec/acceptance/fixtures/slave.pp b/spec/acceptance/fixtures/slave.pp index e4f562f..a6e2ef3 100644 --- a/spec/acceptance/fixtures/slave.pp +++ b/spec/acceptance/fixtures/slave.pp @@ -1,6 +1,5 @@ class { '::jenkins::slave': - ssh_key => 'sshkey', - user => true + user => true } class { '::jenkins::job_builder':