Use common jenkins master implementation
Change-Id: Ia18fe6e298caa5a9b017e6c6f5ef6f189f150335 Depends-On: I635f039021f67828f6d13b13527288aedc9e4390
This commit is contained in:
		@@ -46,7 +46,7 @@ class openstack_project::jenkins (
 | 
			
		||||
    $prv_ssl_key_file = $ssl_key_file
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  class { '::jenkins::master':
 | 
			
		||||
  class { 'openstackci::jenkins_master':
 | 
			
		||||
    vhost_name              => $vhost_name,
 | 
			
		||||
    serveradmin             => $serveradmin,
 | 
			
		||||
    logo                    => $logo,
 | 
			
		||||
@@ -60,65 +60,6 @@ class openstack_project::jenkins (
 | 
			
		||||
    jenkins_ssh_public_key  => $jenkins_ssh_public_key,
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  jenkins::plugin { 'build-timeout':
 | 
			
		||||
    version => '1.14',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'copyartifact':
 | 
			
		||||
    version => '1.22',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'dashboard-view':
 | 
			
		||||
    version => '2.3',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'gearman-plugin':
 | 
			
		||||
    version => '0.1.1',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'git':
 | 
			
		||||
    version => '1.1.23',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'greenballs':
 | 
			
		||||
    version => '1.12',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'extended-read-permission':
 | 
			
		||||
    version => '1.0',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'zmq-event-publisher':
 | 
			
		||||
    version => '0.0.3',
 | 
			
		||||
  }
 | 
			
		||||
#  TODO(jeblair): release
 | 
			
		||||
#  jenkins::plugin { 'scp':
 | 
			
		||||
#    version => '1.9',
 | 
			
		||||
#  }
 | 
			
		||||
  jenkins::plugin { 'jobConfigHistory':
 | 
			
		||||
    version => '1.13',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'monitoring':
 | 
			
		||||
    version => '1.40.0',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'nodelabelparameter':
 | 
			
		||||
    version => '1.2.1',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'notification':
 | 
			
		||||
    version => '1.4',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'openid':
 | 
			
		||||
    version => '1.5',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'postbuildscript':
 | 
			
		||||
    version => '0.16',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'publish-over-ftp':
 | 
			
		||||
    version => '1.7',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'simple-theme-plugin':
 | 
			
		||||
    version => '0.2',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'timestamper':
 | 
			
		||||
    version => '1.3.1',
 | 
			
		||||
  }
 | 
			
		||||
  jenkins::plugin { 'token-macro':
 | 
			
		||||
    version => '1.5.1',
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  if $manage_jenkins_jobs == true {
 | 
			
		||||
    class { 'project_config':
 | 
			
		||||
      url  => $project_config_repo,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user