diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | commands/common.py | 3 | ||||
| -rw-r--r-- | config/deps/buildslave.json | 3 | ||||
| -rw-r--r-- | config/deps/packages-3.4.json | 1 | ||||
| -rw-r--r-- | config/deps/packages-3.6.json | 1 |
5 files changed, 6 insertions, 3 deletions
@@ -8,4 +8,3 @@ logs/*.tar logs/all-logs.tar.bz2 commands/helpers/list-outputs commands/helpers/find-free-display -config diff --git a/commands/common.py b/commands/common.py index 20df94c..b60ae67 100644 --- a/commands/common.py +++ b/commands/common.py @@ -30,6 +30,9 @@ def setup(): "sugar-buildtime-%s" % version, "sugar-runtime-%s" % version] + if "SUGAR_BUILDBOT" in os.environ: + dep_files.append("buildslave") + config.set_dep_files(dep_files) package_files = ["packages-%s" % version] diff --git a/config/deps/buildslave.json b/config/deps/buildslave.json new file mode 100644 index 0000000..ee794ac --- /dev/null +++ b/config/deps/buildslave.json @@ -0,0 +1,3 @@ +{ "buildslave": + { "fedora": ["buildbot"] } +} diff --git a/config/deps/packages-3.4.json b/config/deps/packages-3.4.json index 165c62d..9ffabd8 100644 --- a/config/deps/packages-3.4.json +++ b/config/deps/packages-3.4.json @@ -28,7 +28,6 @@ "xorg-x11-server-Xorg", "grub2", "setserial", - "buildbot", "rootfiles", "e2fsprogs", "openssh-server", diff --git a/config/deps/packages-3.6.json b/config/deps/packages-3.6.json index 5f0efbc..f52a5e8 100644 --- a/config/deps/packages-3.6.json +++ b/config/deps/packages-3.6.json @@ -28,7 +28,6 @@ "xorg-x11-server-Xorg", "grub2", "setserial", - "buildbot", "e2fsprogs", "openssh-server", "mingetty", |