Backed out 5 changesets (bug 1426785) for failing repackage the nightly build on Linux a=backout.

Backed out changeset 08b5850633de (bug 1426785)
Backed out changeset 61453b6473f1 (bug 1426785)
Backed out changeset 851ce8944b41 (bug 1426785)
Backed out changeset 386cd0532519 (bug 1426785)
Backed out changeset 2a52bf9e0898 (bug 1426785)
This commit is contained in:
Coroiu Cristina 2017-12-24 14:03:02 +02:00
Родитель 35ed6b8361
Коммит dbb27acb6d
31 изменённых файлов: 257 добавлений и 41 удалений

Просмотреть файл

@ -10,7 +10,8 @@ ac_add_options --enable-valgrind
. $topsrcdir/build/unix/mozconfig.asan
export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Enable Telemetry
export MOZ_TELEMETRY_REPORTING=1

Просмотреть файл

@ -9,7 +9,8 @@ ac_add_options --enable-valgrind
. $topsrcdir/build/unix/mozconfig.asan
export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1

Просмотреть файл

@ -10,7 +10,8 @@ ac_add_options --enable-valgrind
. $topsrcdir/build/unix/mozconfig.asan
export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Enable Telemetry
export MOZ_TELEMETRY_REPORTING=1

Просмотреть файл

@ -19,6 +19,7 @@ ac_add_options --enable-mozsearch-plugin
. "$topsrcdir/build/unix/mozconfig.stdcxx"
export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
. "$topsrcdir/build/mozconfig.common.override"

Просмотреть файл

@ -18,6 +18,7 @@ ac_add_options --enable-clang-plugin
. "$topsrcdir/build/unix/mozconfig.stdcxx"
export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
. "$topsrcdir/build/mozconfig.common.override"

Просмотреть файл

@ -40,6 +40,7 @@ CFLAGS="$CFLAGS -Wno-attributes"
CPPFLAGS="$CPPFLAGS -Wno-attributes"
CXXFLAGS="$CXXFLAGS -Wno-attributes"
export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
. "$topsrcdir/build/mozconfig.common.override"

Просмотреть файл

@ -9,7 +9,8 @@ ac_add_options --enable-valgrind
. $topsrcdir/build/unix/mozconfig.asan
export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1

Просмотреть файл

@ -11,7 +11,8 @@ ac_add_options --enable-valgrind
ac_add_options --enable-address-sanitizer-reporter
export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Need this to prevent name conflicts with the normal nightly build packages
export MOZ_PKG_SPECIAL=asan-reporter

Просмотреть файл

@ -12,7 +12,8 @@ ac_add_options --enable-valgrind
ac_add_options --enable-fuzzing
unset MOZ_STDCXX_COMPAT
export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1

Просмотреть файл

@ -17,6 +17,7 @@ ac_add_options --enable-clang-plugin
. "$topsrcdir/build/unix/mozconfig.stdcxx"
export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
. "$topsrcdir/build/mozconfig.common.override"

Просмотреть файл

@ -1,6 +1,7 @@
. $topsrcdir/build/unix/mozconfig.tsan
export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
. $topsrcdir/build/unix/mozconfig.gtk
# Need this to prevent name conflicts with the normal nightly build packages
export MOZ_PKG_SPECIAL=tsan

Просмотреть файл

@ -0,0 +1,10 @@
[
{
"size": 11189216,
"digest": "18bc52b0599b1308b667e282abb45f47597bfc98a5140cfcab8da71dacf89dd76d0dee22a04ce26fe7ad1f04e2d6596991f9e5b01fd2aaaab5542965f596b0e6",
"algorithm": "sha512",
"filename": "gtk3.tar.xz",
"setup": "setup.sh",
"unpack": true
}
]

Просмотреть файл

@ -0,0 +1,10 @@
[
{
"size": 12072532,
"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
"algorithm": "sha512",
"filename": "gtk3.tar.xz",
"setup": "setup.sh",
"unpack": true
}
]

Просмотреть файл

@ -0,0 +1,10 @@
[
{
"size": 12072532,
"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
"algorithm": "sha512",
"filename": "gtk3.tar.xz",
"setup": "setup.sh",
"unpack": true
}
]

Просмотреть файл

@ -0,0 +1,10 @@
[
{
"size": 12072532,
"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
"algorithm": "sha512",
"filename": "gtk3.tar.xz",
"setup": "setup.sh",
"unpack": true
}
]

Просмотреть файл

@ -1,7 +1,19 @@
#!/bin/bash
# Use "build-gtk.sh" or "build-gtk.sh 64" to build a 64-bits tarball for tooltool.
# Use "build-gtk.sh 32" to build a 32-bits tarball for tooltool.
# Mock environments used:
# - 64-bits:
# https://s3.amazonaws.com/mozilla-releng-mock-archive/67b65e51eb091fba7941a04d249343924a3ee653
# + libxml2-devel.x86_64 gettext.x86_64 libjpeg-devel.x86_64
# - 32-bits:
# https://s3.amazonaws.com/mozilla-releng-mock-archive/58d76c6acca148a1aedcbec7fc1b8212e12807b4
# + libxml2-devel.i686 gettext.i686 libjpeg-devel.i686
set -e
pkg_config_version=0.28
fontconfig_version=2.8.0
libffi_version=3.0.13
glib_version=2.34.3
@ -12,6 +24,7 @@ pango_version=1.30.1
atk_version=2.2.0
gtk__version=3.4.4
pkg_config_url=http://pkgconfig.freedesktop.org/releases/pkg-config-${pkg_config_version}.tar.gz
fontconfig_url=http://www.freedesktop.org/software/fontconfig/release/fontconfig-${fontconfig_version}.tar.gz
libffi_url=ftp://sourceware.org/pub/libffi/libffi-${libffi_version}.tar.gz
glib_url=http://ftp.gnome.org/pub/gnome/sources/glib/${glib_version%.*}/glib-${glib_version}.tar.xz
@ -22,10 +35,15 @@ pango_url=http://ftp.gnome.org/pub/GNOME/sources/pango/${pango_version%.*}/pango
atk_url=http://ftp.gnome.org/pub/GNOME/sources/atk/${atk_version%.*}/atk-${atk_version}.tar.xz
gtk__url=http://ftp.gnome.org/pub/gnome/sources/gtk+/${gtk__version%.*}/gtk+-${gtk__version}.tar.xz
cwd=$(pwd)
root_dir=$(mktemp -d)
cd $root_dir
make_flags=-j$(nproc)
if test -z $TMPDIR; then
TMPDIR=/tmp/
fi
make_flags=-j12
build() {
name=$1
@ -33,21 +51,18 @@ build() {
pkg=$(echo $name | tr '+-' '__')
version=$(eval echo \$${pkg}_version)
url=$(eval echo \$${pkg}_url)
wget -c -P $root_dir $url
tar -axf $root_dir/$name-$version.tar.*
wget -c -P $TMPDIR $url
tar -axf $TMPDIR/$name-$version.tar.*
mkdir -p build/$name
cd build/$name
eval ../../$name-$version/configure --disable-static $* $configure_args --libdir=/usr/local/$lib
eval ../../$name-$version/configure --disable-static $* $configure_args
make $make_flags
make install
make install DESTDIR=$root_dir/gtk3
find $root_dir/gtk3 -name \*.la -delete
cd ../..
}
for bits in 32 64; do
rm -rf $root_dir/build
case "$bits" in
case "$1" in
32)
configure_args='--host=i686-pc-linux --build=i686-pc-linux CC="gcc -m32" CXX="g++ -m32"'
lib=lib
@ -58,13 +73,26 @@ case "$bits" in
;;
esac
export PKG_CONFIG_LIBDIR=/usr/local/$lib/pkgconfig:/usr/$lib/pkgconfig:/usr/share/pkgconfig
export LD_LIBRARY_PATH=/usr/local/$lib
export PKG_CONFIG_LIBDIR=/usr/$lib/pkgconfig:/usr/share/pkgconfig
# The pkg-config version in the mock images is buggy is how it handles
# PKG_CONFIG_SYSROOT_DIR. So we need our own.
build pkg-config
ln -sf /usr/include $root_dir/gtk3/usr/
ln -sf /usr/$lib $root_dir/gtk3/usr/
if [ "$lib" = lib64 ]; then
ln -s lib $root_dir/gtk3/usr/local/lib64
fi
export PKG_CONFIG_PATH=$root_dir/gtk3/usr/local/lib/pkgconfig
export PKG_CONFIG_SYSROOT_DIR=$root_dir/gtk3
export LD_LIBRARY_PATH=$root_dir/gtk3/usr/local/lib
export PATH=$root_dir/gtk3/usr/local/bin:${PATH}
build fontconfig
build libffi
build glib
build gdk-pixbuf --without-libtiff --without-libjpeg
build gdk-pixbuf --without-libtiff
build pixman --disable-gtk
build cairo --enable-tee
build pango
@ -72,10 +100,51 @@ build atk
make_flags="$make_flags GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
build gtk+
done
rm -rf $root_dir/gtk3/usr/local/share/gtk-doc
rm -rf $root_dir/gtk3/usr/local/share/locale
rm -rf $root_dir
# mock build environment doesn't have fonts in /usr/share/fonts, but
# has some in /usr/share/X11/fonts. Add this directory to the
# fontconfig configuration without changing the gtk3 tooltool package.
cat << EOF > $root_dir/gtk3/usr/local/etc/fonts/local.conf
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<dir>/usr/share/X11/fonts</dir>
</fontconfig>
EOF
echo /usr/local/lib > /etc/ld.so.conf.d/local.conf
echo /usr/local/lib64 >> /etc/ld.so.conf.d/local.conf
ldconfig
cat <<EOF > $root_dir/gtk3/setup.sh
#!/bin/sh
cd \$(dirname \$0)
HERE=\$(pwd)
# pango expects absolute paths in pango.modules, and TOOLTOOL_DIR may vary...
LD_LIBRARY_PATH=\$HERE/usr/local/lib \
PANGO_SYSCONFDIR=\$HERE/usr/local/etc \
PANGO_LIBDIR=\$HERE/usr/local/lib \
\$HERE/usr/local/bin/pango-querymodules > \$HERE/usr/local/etc/pango/pango.modules
# same with gdb-pixbuf and loaders.cache
LD_LIBRARY_PATH=\$HERE/usr/local/lib \
GDK_PIXBUF_MODULE_FILE=\$HERE/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
GDK_PIXBUF_MODULEDIR=\$HERE/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders \
\$HERE/usr/local/bin/gdk-pixbuf-query-loaders > \
\$HERE/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
# The fontconfig version in the tooltool package has known uses of
# uninitialized memory when creating its cache, and while most users
# will already have an existing cache, running Firefox on automation
# will create it. Combined with valgrind, this generates irrelevant
# errors.
# So create the fontconfig cache beforehand.
FONTCONFIG_PATH=\$HERE/usr/local/etc/fonts \
LD_LIBRARY_PATH=\$HERE/usr/local/lib \
\$HERE/usr/local/bin/fc-cache
EOF
chmod +x $root_dir/gtk3/setup.sh
cd $cwd
tar -C $root_dir -Jcf gtk3.tar.xz gtk3

28
build/unix/mozconfig.gtk Normal file
Просмотреть файл

@ -0,0 +1,28 @@
# To do try builds with Gtk+2, uncomment the following line, and remove
# everything after that.
#ac_add_options --enable-default-toolkit=cairo-gtk2
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
# $TOOLTOOL_DIR/gtk3 comes from tooltool, and must be included in the tooltool manifest.
if [ -z "$PKG_CONFIG_LIBDIR" ]; then
echo PKG_CONFIG_LIBDIR must be set >&2
exit 1
fi
export PKG_CONFIG_SYSROOT_DIR="$TOOLTOOL_DIR/gtk3"
export PKG_CONFIG_PATH="$TOOLTOOL_DIR/gtk3/usr/local/lib/pkgconfig"
PKG_CONFIG="$TOOLTOOL_DIR/gtk3/usr/local/bin/pkg-config"
export PATH="$TOOLTOOL_DIR/gtk3/usr/local/bin:${PATH}"
# Ensure cairo, gdk-pixbuf, etc. are not taken from the system installed packages.
LDFLAGS="-L$TOOLTOOL_DIR/gtk3/usr/local/lib ${LDFLAGS}"
ac_add_options --enable-default-toolkit=cairo-gtk3
# Set things up to use Gtk+3 from the tooltool package
mk_add_options "export FONTCONFIG_PATH=$TOOLTOOL_DIR/gtk3/usr/local/etc/fonts"
mk_add_options "export PANGO_SYSCONFDIR=$TOOLTOOL_DIR/gtk3/usr/local/etc"
mk_add_options "export PANGO_LIBDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib"
mk_add_options "export GDK_PIXBUF_MODULE_FILE=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
mk_add_options "export GDK_PIXBUF_MODULEDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders"
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/gtk3/usr/local/lib
mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"

Просмотреть файл

@ -27,4 +27,6 @@ fi
. "$topsrcdir/build/unix/mozconfig.stdcxx"
# PKG_CONFIG_LIBDIR is appropriately overridden in mozconfig.linux32
export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
. "$topsrcdir/build/unix/mozconfig.gtk"

Просмотреть файл

@ -1,6 +1,6 @@
. "$topsrcdir/build/unix/mozconfig.linux"
export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
export MOZ_LINUX_32_SSE2_STARTUP_ERROR=1
@ -12,4 +12,5 @@ if test `uname -m` = "x86_64"; then
CXX="$CXX -m32 -march=pentium-m"
ac_add_options --target=i686-pc-linux
ac_add_options --host=i686-pc-linux
ac_add_options --x-libraries=/usr/lib
fi

Просмотреть файл

@ -0,0 +1,10 @@
[
{
"size": 12072532,
"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
"algorithm": "sha512",
"filename": "gtk3.tar.xz",
"setup": "setup.sh",
"unpack": true
}
]

Просмотреть файл

@ -29,6 +29,8 @@ jobs:
worker:
docker-image: {in-tree: desktop-build}
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build]

Просмотреть файл

@ -9,6 +9,8 @@ linux64/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -38,6 +40,8 @@ linux64-dmd/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -68,6 +72,8 @@ linux64/pgo:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -99,6 +105,7 @@ linux64-fuzzing/debug:
max-run-time: 36000
env:
PERFHERDER_EXTRA_OPTIONS: fuzzing
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -128,6 +135,8 @@ linux64/debug:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -162,6 +171,8 @@ linux64-devedition-nightly/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -196,6 +207,7 @@ linux64-base-toolchains/opt:
max-run-time: 36000
env:
PERFHERDER_EXTRA_OPTIONS: base-toolchains
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/base-toolchains.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -226,6 +238,7 @@ linux64-base-toolchains/debug:
max-run-time: 36000
env:
PERFHERDER_EXTRA_OPTIONS: base-toolchains
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/base-toolchains.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -255,6 +268,8 @@ linux/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -283,6 +298,8 @@ linux/debug:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -312,6 +329,8 @@ linux/pgo:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -344,6 +363,7 @@ linux-rusttests/opt:
max-run-time: 5400
env:
PERFHERDER_EXTRA_OPTIONS: rusttests
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -378,6 +398,7 @@ linux-rusttests/debug:
max-run-time: 5400
env:
PERFHERDER_EXTRA_OPTIONS: rusttests
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -414,6 +435,8 @@ linux-devedition-nightly/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -451,6 +474,8 @@ linux-nightly/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -482,6 +507,7 @@ linux64-asan/opt:
worker:
env:
PERFHERDER_EXTRA_OPTIONS: "opt asan"
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
max-run-time: 36000
run:
using: mozharness
@ -514,6 +540,7 @@ linux64-asan-fuzzing/opt:
worker:
env:
PERFHERDER_EXTRA_OPTIONS: asan-fuzzing
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
max-run-time: 36000
run:
using: mozharness
@ -545,6 +572,7 @@ linux64-asan-reporter/opt:
worker:
env:
PERFHERDER_EXTRA_OPTIONS: asan-reporter
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
max-run-time: 36000
run:
using: mozharness
@ -576,6 +604,7 @@ linux64-asan/debug:
worker:
env:
PERFHERDER_EXTRA_OPTIONS: "debug asan"
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
max-run-time: 36000
run:
using: mozharness
@ -611,6 +640,8 @@ linux64-nightly/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -641,6 +672,8 @@ linux64-noopt/debug:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 3600
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -675,6 +708,7 @@ linux64-rusttests/opt:
max-run-time: 5400
env:
PERFHERDER_EXTRA_OPTIONS: rusttests
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -709,6 +743,7 @@ linux64-rusttests/debug:
max-run-time: 5400
env:
PERFHERDER_EXTRA_OPTIONS: rusttests
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -742,6 +777,8 @@ linux64-jsdcov/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -772,6 +809,8 @@ linux64-ccov/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]
@ -801,6 +840,8 @@ linux64-add-on-devel/opt:
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build check-test update]

Просмотреть файл

@ -31,6 +31,9 @@ jobs:
treeherder:
platform: linux64/debug
symbol: SM-tc(H)
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: hazard
command: >
@ -54,6 +57,9 @@ jobs:
treeherder:
platform: linux64/debug
symbol: tc(H)
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: hazard
mozconfig: "browser/config/mozconfigs/linux64/hazards"

Просмотреть файл

@ -33,6 +33,8 @@ jobs:
worker:
docker-image: {in-tree: desktop-build}
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [clobber build]

Просмотреть файл

@ -201,6 +201,8 @@ jobs:
worker:
max-run-time: 36000
docker-image: {in-tree: desktop-build}
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux32/releng.manifest"
run:
spidermonkey-variant: arm-sim
@ -290,6 +292,8 @@ jobs:
worker:
max-run-time: 36000
docker-image: {in-tree: desktop-build}
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/tsan.manifest"
run:
spidermonkey-variant: tsan

Просмотреть файл

@ -32,6 +32,8 @@ jobs:
worker:
docker-image: {in-tree: desktop-build}
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [build]
@ -57,6 +59,8 @@ jobs:
worker:
docker-image: {in-tree: desktop-build}
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [build]

Просмотреть файл

@ -28,6 +28,8 @@ jobs:
worker:
docker-image: {in-tree: valgrind-build}
max-run-time: 72000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [get-secrets build valgrind-test]

Просмотреть файл

@ -33,13 +33,10 @@ ADD topsrcdir/taskcluster/docker/recipes/install-cmake.sh /setup/install-cmake.s
# %include taskcluster/docker/recipes/centos6-build-system-setup.sh
ADD topsrcdir/taskcluster/docker/recipes/centos6-build-system-setup.sh /setup/system-setup.sh
# %include build/unix/build-gtk3/build-gtk3.sh
ADD topsrcdir/build/unix/build-gtk3/build-gtk3.sh /setup/build-gtk3.sh
# TODO remove once base image doesn't install Mercurial
RUN pip uninstall -y Mercurial
RUN bash /setup/build-gtk3.sh && bash /setup/system-setup.sh
RUN bash /setup/system-setup.sh
# Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
# %include taskcluster/docker/recipes/xvfb.sh

Просмотреть файл

@ -39,13 +39,10 @@ ADD topsrcdir/taskcluster/docker/recipes/centos6-build-system-setup.sh /setup/sy
# %include taskcluster/docker/recipes/centos-install-debug-symbols.sh
ADD topsrcdir/taskcluster/docker/recipes/centos-install-debug-symbols.sh /setup/install-debug-symbols.sh
# %include build/unix/build-gtk3/build-gtk3.sh
ADD topsrcdir/build/unix/build-gtk3/build-gtk3.sh /setup/build-gtk3.sh
# TODO remove once base image doesn't install Mercurial
RUN pip uninstall -y Mercurial
RUN bash /setup/build-gtk3.sh && bash /setup/system-setup.sh
RUN bash /setup/system-setup.sh
# Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
# %include taskcluster/docker/recipes/xvfb.sh

Просмотреть файл

@ -53,7 +53,7 @@ export MOZ_OBJDIR="$WORKSPACE/obj-analyzed"
mkdir -p "$MOZ_OBJDIR"
if [ -n "$DO_TOOLTOOL" ]; then
( cd $TOOLTOOL_DIR; $GECKO_DIR/mach artifact toolchain -v${TOOLTOOL_MANIFEST:+ --tooltool-url https://tooltool.mozilla-releng.net/ --tooltool-manifest $GECKO_DIR/$TOOLTOOL_MANIFEST} --cache-dir $TOOLTOOL_CACHE${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}} )
( cd $TOOLTOOL_DIR; $GECKO_DIR/mach artifact toolchain -v --tooltool-url https://tooltool.mozilla-releng.net/ --tooltool-manifest $GECKO_DIR/$TOOLTOOL_MANIFEST --cache-dir $TOOLTOOL_CACHE${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}} )
fi
export NO_MERCURIAL_SETUP_CHECK=1

Просмотреть файл

@ -56,7 +56,7 @@ BROWSER_PLATFORM=$PLATFORM_OS$BITS
: ${TOOLTOOL_CHECKOUT:=$WORK}
export TOOLTOOL_CHECKOUT
(cd $TOOLTOOL_CHECKOUT && ${SRCDIR}/mach artifact toolchain${TOOLTOOL_MANIFEST:+ -v $TOOLTOOL_AUTH_FLAGS --tooltool-url $TOOLTOOL_SERVER --tooltool-manifest $SRCDIR/$TOOLTOOL_MANIFEST}${TOOLTOOL_CACHE:+ --cache-dir $TOOLTOOL_CACHE}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}})
(cd $TOOLTOOL_CHECKOUT && ${SRCDIR}/mach artifact toolchain -v $TOOLTOOL_AUTH_FLAGS --tooltool-url $TOOLTOOL_SERVER --tooltool-manifest $SRCDIR/$TOOLTOOL_MANIFEST ${TOOLTOOL_CACHE:+ --cache-dir $TOOLTOOL_CACHE}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}})
# Add all the tooltool binaries to our $PATH.
for bin in $TOOLTOOL_CHECKOUT/*/bin $TOOLTOOL_CHECKOUT/VC/bin/Hostx64/x86; do