From 3abc49076988727a13f5fb78004e20294eb5bb1f Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Thu, 22 Nov 2018 13:01:17 +0100 Subject: [PATCH] pass extraVars to ansible on ci.centos.org --- .../centos.org/pipelines/lib/foremanCentosJob.groovy | 6 +++++- .../pipelines/test/katello/3.10-upgrade.groovy | 2 +- .../centos.org/pipelines/test/katello/3.10.groovy | 2 +- .../pipelines/test/katello/3.8-upgrade.groovy | 2 +- .../centos.org/pipelines/test/katello/3.8.groovy | 2 +- .../pipelines/test/katello/3.9-upgrade.groovy | 2 +- .../centos.org/pipelines/test/katello/3.9.groovy | 2 +- .../pipelines/test/katelloNightlyTest.groovy | 2 +- .../pipelines/test/katelloUpgradeNightly.groovy | 2 +- .../files/theforeman.org/pipelines/lib/duffy.groovy | 12 ++++++++++-- 10 files changed, 23 insertions(+), 11 deletions(-) diff --git a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/lib/foremanCentosJob.groovy b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/lib/foremanCentosJob.groovy index 5ca108b3f..3c0499657 100644 --- a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/lib/foremanCentosJob.groovy +++ b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/lib/foremanCentosJob.groovy @@ -27,7 +27,11 @@ pipeline { } stage('Run Pipeline') { steps { - duffy_ssh("cd forklift && ansible-playbook pipelines/${playBook['pipeline']} -e forklift_state=up", 'duffy_box', './') + script { + extra_vars_file = writeExtraVars(extraVars: playBook['extraVars']) + duffy_scp_put("${extra_vars_file}", "forklift/${extra_vars_file}", 'duffy_box', './') + duffy_ssh("cd forklift && ansible-playbook pipelines/${playBook['pipeline']} -e forklift_state=up -e @${extra_vars_file}", 'duffy_box', './') + } } } } diff --git a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.10-upgrade.groovy b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.10-upgrade.groovy index 0b09aef99..74ae31bd8 100644 --- a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.10-upgrade.groovy +++ b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.10-upgrade.groovy @@ -1,4 +1,4 @@ def playBookVars() { - playBook = ['boxes': ['pipeline-upgrade-centos7'], 'pipeline': 'pipeline_katello_upgrade_310.yml'] + playBook = ['boxes': ['pipeline-upgrade-centos7'], 'pipeline': 'katello_upgrade_pipeline.yml', 'extraVars': ['katello_version': '3.10']] return playBook } diff --git a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.10.groovy b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.10.groovy index b133a2420..ea3fd9e04 100644 --- a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.10.groovy +++ b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.10.groovy @@ -1,4 +1,4 @@ def playBookVars() { - playBook = ['boxes': ['pipeline-katello-3.10-centos7'], 'pipeline': 'pipeline_katello_310.yml'] + playBook = ['boxes': ['pipeline-katello-3.10-centos7'], 'pipeline': 'katello_pipeline.yml', 'extraVars': ['katello_version': '3.10']] return playBook } diff --git a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.8-upgrade.groovy b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.8-upgrade.groovy index d8cb63c9d..8826079fa 100644 --- a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.8-upgrade.groovy +++ b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.8-upgrade.groovy @@ -1,4 +1,4 @@ def playBookVars() { - playBook = ['boxes': ['pipeline-upgrade-centos7'], 'pipeline': 'pipeline_katello_upgrade_38.yml'] + playBook = ['boxes': ['pipeline-upgrade-centos7'], 'pipeline': 'katello_upgrade_pipeline.yml', 'extraVars': ['katello_version': '3.8']] return playBook } diff --git a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.8.groovy b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.8.groovy index 107bf15ed..7856e121d 100644 --- a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.8.groovy +++ b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.8.groovy @@ -1,4 +1,4 @@ def playBookVars() { - playBook = ['boxes': ['pipeline-katello-3.8-centos7'], 'pipeline': 'pipeline_katello_38.yml'] + playBook = ['boxes': ['pipeline-katello-3.8-centos7'], 'pipeline': 'katello_pipeline.yml', 'extraVars': ['katello_version': '3.8']] return playBook } diff --git a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.9-upgrade.groovy b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.9-upgrade.groovy index 55745da11..e54a9d5ef 100644 --- a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.9-upgrade.groovy +++ b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.9-upgrade.groovy @@ -1,4 +1,4 @@ def playBookVars() { - playBook = ['boxes': ['pipeline-upgrade-centos7'], 'pipeline': 'pipeline_katello_upgrade_39.yml'] + playBook = ['boxes': ['pipeline-upgrade-centos7'], 'pipeline': 'katello_upgrade_pipeline.yml', 'extraVars': ['katello_version': '3.9']] return playBook } diff --git a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.9.groovy b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.9.groovy index f38753f39..e6e6ef51d 100644 --- a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.9.groovy +++ b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katello/3.9.groovy @@ -1,4 +1,4 @@ def playBookVars() { - playBook = ['boxes': ['pipeline-katello-3.9-centos7'], 'pipeline': 'pipeline_katello_39.yml'] + playBook = ['boxes': ['pipeline-katello-3.9-centos7'], 'pipeline': 'katello_pipeline.yml', 'extraVars': ['katello_version': '3.9']] return playBook } diff --git a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katelloNightlyTest.groovy b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katelloNightlyTest.groovy index 942296f34..45b2559a0 100644 --- a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katelloNightlyTest.groovy +++ b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katelloNightlyTest.groovy @@ -1,4 +1,4 @@ def playBookVars() { - playBook = ['boxes': ['pipeline-katello-nightly-centos7'], 'pipeline': 'pipeline_katello_nightly.yml'] + playBook = ['boxes': ['pipeline-katello-nightly-centos7'], 'pipeline': 'pipeline_katello.yml', 'extraVars': ['katello_version': 'nightly']] return playBook } diff --git a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katelloUpgradeNightly.groovy b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katelloUpgradeNightly.groovy index 5b0a5b79c..087e612d2 100644 --- a/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katelloUpgradeNightly.groovy +++ b/puppet/modules/jenkins_job_builder/files/centos.org/pipelines/test/katelloUpgradeNightly.groovy @@ -1,4 +1,4 @@ def playBookVars() { - playBook = ['boxes': ['pipeline-upgrade-centos7'], 'pipeline': 'pipeline_katello_upgrade_nightly.yml'] + playBook = ['boxes': ['pipeline-upgrade-centos7'], 'pipeline': 'pipeline_katello_upgrade.yml', 'extraVars': ['katello_version': 'nightly']] return playBook } diff --git a/puppet/modules/jenkins_job_builder/files/theforeman.org/pipelines/lib/duffy.groovy b/puppet/modules/jenkins_job_builder/files/theforeman.org/pipelines/lib/duffy.groovy index de3a5bab1..26ae596fe 100644 --- a/puppet/modules/jenkins_job_builder/files/theforeman.org/pipelines/lib/duffy.groovy +++ b/puppet/modules/jenkins_job_builder/files/theforeman.org/pipelines/lib/duffy.groovy @@ -40,6 +40,14 @@ def duffy_ssh(command, box_name, relative_dir = '') { color_shell "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -F ${ssh_config(relative_dir)} ${box_name} '${command}'" } -def duffy_scp(file_path, file_dest, box_name, relative_dir = '') { - color_shell "scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -r -F ${ssh_config(relative_dir)} ${box_name}:${file_path} ${file_dest}" +def duffy_scp_get(file_path, file_dest, box_name, relative_dir = '') { + duffy_scp("${box_name}:${file_path}", "${file_dest}", relative_dir) +} + +def duffy_scp_put(file_path, file_dest, box_name, relative_dir = '') { + duffy_scp("${file_path}", "${box_name}:${file_dest}", relative_dir) +} + +def duffy_scp(src, dest, relative_dir = '') { + color_shell "scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -r -F ${ssh_config(relative_dir)} ${src} ${dest}" }