diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 17:06:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 17:06:41 +0300 |
| commit | b330804ff3eca68cdd65e26d551d1829fae5ff36 (patch) | |
| tree | 7501de6265ae963e064a580e6339539740a9008b /build_files | |
| parent | 9e2ec6c86a9ea2e387fe5e523df06c0a462819b7 (diff) | |
| parent | 9fb1f9c5cdccc14f65ba2047e5656b360142aa43 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 4 | ||||
| -rw-r--r-- | build_files/buildbot/slave_test.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 41841d809eb..a0b5e8c6517 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -138,11 +138,11 @@ if builder.find('cmake') != -1: blender_glibc = builder.split('_')[1] if builder.endswith('x86_64_cmake'): - chroot_name = 'buildbot_squeeze_x86_64' + chroot_name = 'buildbot_jessie_x86_64' bits = 64 blender_arch = 'x86_64' elif builder.endswith('i686_cmake'): - chroot_name = 'buildbot_squeeze_i686' + chroot_name = 'buildbot_jessie_i686' bits = 32 blender_arch = 'i686' diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py index 6f313ede2ee..cd4730cba25 100644 --- a/build_files/buildbot/slave_test.py +++ b/build_files/buildbot/slave_test.py @@ -44,9 +44,9 @@ if "cmake" in builder: """ if builder.endswith('x86_64_cmake'): - chroot_name = 'buildbot_squeeze_x86_64' + chroot_name = 'buildbot_jessie_x86_64' elif builder.endswith('i686_cmake'): - chroot_name = 'buildbot_squeeze_i686' + chroot_name = 'buildbot_jessie_i686' if chroot_name: chroot_prefix = ['schroot', '-c', chroot_name, '--'] """ |