diff --git a/puppet/modules/slave/manifests/init.pp b/puppet/modules/slave/manifests/init.pp index eae208685..3b061d4be 100644 --- a/puppet/modules/slave/manifests/init.pp +++ b/puppet/modules/slave/manifests/init.pp @@ -34,6 +34,9 @@ "katello_installer", "kafo", "kafo_parsers", + "foreman_discovery", + "foreman_docker", + "foreman_salt", ]: } slave::pr_test_config { "hammer_cli_katello": ensure => absent, diff --git a/puppet/modules/slave/templates/test_pull_requests_foreman_discovery.json.erb b/puppet/modules/slave/templates/test_pull_requests_foreman_discovery.json.erb new file mode 100644 index 000000000..332693917 --- /dev/null +++ b/puppet/modules/slave/templates/test_pull_requests_foreman_discovery.json.erb @@ -0,0 +1,49 @@ +{ + "proxy_host": null, + "proxy_port": null, + "jenkins_host": "http://ci.theforeman.org/", + "jenkins_url": "http://ci.theforeman.org/", + "hub_config": "~/.config/hub", + "github_user": "theforeman", + "bot_github_user": "<%= github_user -%>", + "irc_channel": "#theforeman-dev", + "not_mergable_cache": "~/test_pull_request_foreman_discovery_not_mergable", + "repo_groups": { + "foreman_discovery": "foreman_discovery", + }, + "settings": { + "test_settings": { + "name": "test", + "test_prefix": "Test Results:", + "allow_multiple": true, + "run_without_trigger": true, + "branches": { + "*": { + "jenkins_job_name": "test_plugin_pull_request", + "downstream_job_name": "test_plugin_foreman_discovery", + "build_token": "<%= jenkins_build_token -%>", + "addtl_jenkins_params": { + "foreman_discovery": { + "plugin_repo": "https://github.com/theforeman/foreman_discovery.git", + "plugin_name": "foreman_discovery" + } + } + } + }, + "repo_to_orgs": { + "foreman_discovery": [ + "theforeman", + "katello" + ] + }, + "repo_to_pull_id_param": { + "foreman_discovery": { + "git_url": "pr_git_url", + "ref": "pr_git_ref", + "number": "pr_number", + "base_branch": "plugin_branch" + } + } + } + } +} diff --git a/puppet/modules/slave/templates/test_pull_requests_foreman_docker.json.erb b/puppet/modules/slave/templates/test_pull_requests_foreman_docker.json.erb new file mode 100644 index 000000000..b5c6c4607 --- /dev/null +++ b/puppet/modules/slave/templates/test_pull_requests_foreman_docker.json.erb @@ -0,0 +1,49 @@ +{ + "proxy_host": null, + "proxy_port": null, + "jenkins_host": "http://ci.theforeman.org/", + "jenkins_url": "http://ci.theforeman.org/", + "hub_config": "~/.config/hub", + "github_user": "theforeman", + "bot_github_user": "<%= github_user -%>", + "irc_channel": "#theforeman-dev", + "not_mergable_cache": "~/test_pull_request_foreman_docker_not_mergable", + "repo_groups": { + "foreman_docker": "foreman_docker", + }, + "settings": { + "test_settings": { + "name": "test", + "test_prefix": "Test Results:", + "allow_multiple": true, + "run_without_trigger": true, + "branches": { + "*": { + "jenkins_job_name": "test_plugin_pull_request", + "downstream_job_name": "test_plugin_foreman_docker", + "build_token": "<%= jenkins_build_token -%>", + "addtl_jenkins_params": { + "foreman_docker": { + "plugin_repo": "https://github.com/theforeman/foreman-docker.git", + "plugin_name": "foreman_docker" + } + } + } + }, + "repo_to_orgs": { + "foreman_docker": [ + "theforeman", + "katello" + ] + }, + "repo_to_pull_id_param": { + "foreman_docker": { + "git_url": "pr_git_url", + "ref": "pr_git_ref", + "number": "pr_number", + "base_branch": "plugin_branch" + } + } + } + } +} diff --git a/puppet/modules/slave/templates/test_pull_requests_foreman_salt.json.erb b/puppet/modules/slave/templates/test_pull_requests_foreman_salt.json.erb new file mode 100644 index 000000000..f6428c366 --- /dev/null +++ b/puppet/modules/slave/templates/test_pull_requests_foreman_salt.json.erb @@ -0,0 +1,49 @@ +{ + "proxy_host": null, + "proxy_port": null, + "jenkins_host": "http://ci.theforeman.org/", + "jenkins_url": "http://ci.theforeman.org/", + "hub_config": "~/.config/hub", + "github_user": "theforeman", + "bot_github_user": "<%= github_user -%>", + "irc_channel": "#theforeman-dev", + "not_mergable_cache": "~/test_pull_request_foreman_salt_not_mergable", + "repo_groups": { + "foreman_salt": "foreman_salt", + }, + "settings": { + "test_settings": { + "name": "test", + "test_prefix": "Test Results:", + "allow_multiple": true, + "run_without_trigger": true, + "branches": { + "*": { + "jenkins_job_name": "test_plugin_pull_request", + "downstream_job_name": "test_plugin_foreman_salt", + "build_token": "<%= jenkins_build_token -%>", + "addtl_jenkins_params": { + "foreman_salt": { + "plugin_repo": "https://github.com/theforeman/foreman_salt.git", + "plugin_name": "foreman_salt" + } + } + } + }, + "repo_to_orgs": { + "foreman_salt": [ + "theforeman", + "katello" + ] + }, + "repo_to_pull_id_param": { + "foreman_salt": { + "git_url": "pr_git_url", + "ref": "pr_git_ref", + "number": "pr_number", + "base_branch": "plugin_branch" + } + } + } + } +}