autoproj-jenkins 0.3.4 → 0.3.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/autoproj/cli/jenkins.rb +5 -5
- data/lib/autoproj/jenkins/updater.rb +4 -4
- data/lib/autoproj/jenkins/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bae28a8e387136d89f842898c029ba737092082d
|
|
4
|
+
data.tar.gz: b0bd80032a00e151e3295cc8163fb032261ddcf8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ba7578d68cfd9c526d9d3dc6fc1fa088f36d473ab88b0fa7aa49329f4bb48c674cf13cc211c319d7480605d8cc25280c998b61e4ab86f831a2524326d16c2fe5
|
|
7
|
+
data.tar.gz: 623860bfb37dd462673ad84e42d628d5c517f716e855448ca42faab66661c6752415524d11fe655a2fc230dbf8c248b30ca716b978eeb37cba62ed41f028a806
|
data/lib/autoproj/cli/jenkins.rb
CHANGED
|
@@ -33,11 +33,11 @@ module Autoproj
|
|
|
33
33
|
autoproj_install_path = nil
|
|
34
34
|
end
|
|
35
35
|
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
updater.create_or_update_buildconf_job(*
|
|
36
|
+
# Must NOT resolve the package names into packages. If they are
|
|
37
|
+
# package sets/metapackages, they need to be provided as-is to
|
|
38
|
+
# the buildconf template, so that the metapackage gets resolved
|
|
39
|
+
# each time instead of only at the point 'jenkins init' was done
|
|
40
|
+
updater.create_or_update_buildconf_job(*package_names, gemfile: gemfile,
|
|
41
41
|
autoproj_install_path: autoproj_install_path, dev: dev,
|
|
42
42
|
credentials_id: credentials_id,
|
|
43
43
|
vcs_credentials: parse_vcs_credentials(vcs_credentials))
|
|
@@ -50,7 +50,7 @@ module Autoproj::Jenkins
|
|
|
50
50
|
# with --dev or not
|
|
51
51
|
# @param [Array<Autoproj::PackageDefinition>] packages if non-empty,
|
|
52
52
|
# restrict operations to these packages and their dependencies
|
|
53
|
-
def update_buildconf_pipeline(*
|
|
53
|
+
def update_buildconf_pipeline(*package_names, gemfile: 'buildconf-Gemfile', autoproj_install_path: nil, dev: false, credentials_id: nil, vcs_credentials: Credentials.new)
|
|
54
54
|
manifest_vcs = ws.manifest.vcs
|
|
55
55
|
if manifest_vcs.local? || manifest_vcs.none?
|
|
56
56
|
raise ArgumentError, "cannot use Jenkins to build an autoproj buildconf that is not on a remotely acessible VCS"
|
|
@@ -59,7 +59,7 @@ module Autoproj::Jenkins
|
|
|
59
59
|
job_name = job_name_from_package_name("buildconf")
|
|
60
60
|
server.update_job_pipeline(job_name, 'buildconf.pipeline',
|
|
61
61
|
vcs: manifest_vcs,
|
|
62
|
-
package_names:
|
|
62
|
+
package_names: package_names,
|
|
63
63
|
gemfile: gemfile,
|
|
64
64
|
autoproj_install_path: autoproj_install_path,
|
|
65
65
|
job_prefix: job_prefix,
|
|
@@ -77,12 +77,12 @@ module Autoproj::Jenkins
|
|
|
77
77
|
# within VMs
|
|
78
78
|
# @param [Integer] quiet_period the job's quiet period, in seconds.
|
|
79
79
|
# Mostly used within autoproj-jenkins tests
|
|
80
|
-
def create_or_update_buildconf_job(*
|
|
80
|
+
def create_or_update_buildconf_job(*package_names, gemfile: 'buildconf-Gemfile', autoproj_install_path: nil, dev: false, quiet_period: 5, credentials_id: nil, vcs_credentials: Credentials.new)
|
|
81
81
|
job_name = job_name_from_package_name("buildconf")
|
|
82
82
|
server.create_or_reset_job(job_name, 'buildconf.xml', quiet_period: quiet_period)
|
|
83
83
|
|
|
84
84
|
update_buildconf_pipeline(
|
|
85
|
-
*
|
|
85
|
+
*package_names,
|
|
86
86
|
gemfile: gemfile,
|
|
87
87
|
autoproj_install_path: autoproj_install_path,
|
|
88
88
|
credentials_id: credentials_id,
|