Remove Build-Ubuntu18-GCC job
This partially reverts https://skia-review.googlesource.com/c/skia/+/254797. The Ubuntu18 GCC job was added in anticipation of using it for Valgrind jobs; however, https://skia-review.googlesource.com/c/skia/+/255537 switches Valgrind to Clang, which makes this unnecessary. Bug: skia:9632 Change-Id: I97d7e0d4e3be109ae48b386140117aac4279618f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255790 Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
This commit is contained in:
Ben Wagner
Skia Commit-Bot
parent
bff12d60f6
commit
0788481c63
@ -113,7 +113,6 @@
|
|||||||
"Build-Mac-Clang-x86_64-Release-Metal",
|
"Build-Mac-Clang-x86_64-Release-Metal",
|
||||||
"Build-Mac-Clang-x86_64-Release-TSAN",
|
"Build-Mac-Clang-x86_64-Release-TSAN",
|
||||||
"Build-Mac-Clang-x86_64-Release-TSAN_Metal",
|
"Build-Mac-Clang-x86_64-Release-TSAN_Metal",
|
||||||
"Build-Ubuntu18-GCC-x86_64-Release-Docker",
|
|
||||||
"Build-Win-Clang-arm64-Debug",
|
"Build-Win-Clang-arm64-Debug",
|
||||||
"Build-Win-Clang-arm64-Debug-ANGLE",
|
"Build-Win-Clang-arm64-Debug-ANGLE",
|
||||||
"Build-Win-Clang-arm64-Release",
|
"Build-Win-Clang-arm64-Release",
|
||||||
|
|||||||
@ -17,9 +17,6 @@ IMAGES = {
|
|||||||
'gcc-debian10-mips64el': (
|
'gcc-debian10-mips64el': (
|
||||||
'gcr.io/skia-public/gcc-debian10-mips64el@sha256:'
|
'gcr.io/skia-public/gcc-debian10-mips64el@sha256:'
|
||||||
'c173a718d9f62f0cd1e5335713ebc4721d5dcf662fb02597744b71c53338a540'),
|
'c173a718d9f62f0cd1e5335713ebc4721d5dcf662fb02597744b71c53338a540'),
|
||||||
'gcc-ubuntu18': (
|
|
||||||
'gcr.io/skia-public/gcc-ubuntu18@sha256:'
|
|
||||||
'3439bba135be1593de385f89b59e503ab28ef637ba634e2ecec43559dd928c69'),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -76,11 +73,6 @@ def compile_fn(api, checkout_root, out_dir):
|
|||||||
image_name = 'gcc-debian10-mips64el'
|
image_name = 'gcc-debian10-mips64el'
|
||||||
args['cc'] = '/usr/bin/mips64el-linux-gnuabi64-gcc-8'
|
args['cc'] = '/usr/bin/mips64el-linux-gnuabi64-gcc-8'
|
||||||
args['cxx'] = '/usr/bin/mips64el-linux-gnuabi64-g++-8'
|
args['cxx'] = '/usr/bin/mips64el-linux-gnuabi64-g++-8'
|
||||||
if (os == 'Ubuntu18' and compiler == 'GCC' and target_arch == 'x86_64' and
|
|
||||||
not extra_tokens):
|
|
||||||
args['cc'] = 'gcc'
|
|
||||||
args['cxx'] = 'g++'
|
|
||||||
image_name = 'gcc-ubuntu18'
|
|
||||||
|
|
||||||
if not image_name:
|
if not image_name:
|
||||||
raise Exception('Not implemented: ' + api.vars.builder_name)
|
raise Exception('Not implemented: ' + api.vars.builder_name)
|
||||||
|
|||||||
@ -1,122 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"cmd": [],
|
|
||||||
"name": "Docker setup"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"cmd": [
|
|
||||||
"vpython",
|
|
||||||
"-u",
|
|
||||||
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
|
|
||||||
"--json-output",
|
|
||||||
"/path/to/tmp/json",
|
|
||||||
"ensure-directory",
|
|
||||||
"--mode",
|
|
||||||
"0777",
|
|
||||||
"[START_DIR]/cache/work/skia/out/Build-Ubuntu18-GCC-x86_64-Release-Docker/Release"
|
|
||||||
],
|
|
||||||
"infra_step": true,
|
|
||||||
"name": "Docker setup.mkdirs out_dir",
|
|
||||||
"~followup_annotations": [
|
|
||||||
"@@@STEP_NEST_LEVEL@1@@@"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"cmd": [
|
|
||||||
"chmod",
|
|
||||||
"777",
|
|
||||||
"[START_DIR]/cache/work/skia/out/Build-Ubuntu18-GCC-x86_64-Release-Docker/Release"
|
|
||||||
],
|
|
||||||
"infra_step": true,
|
|
||||||
"name": "Docker setup.chmod 777 [START_DIR]/cache/work/skia/out/Build-Ubuntu18-GCC-x86_64-Release-Docker/Release",
|
|
||||||
"~followup_annotations": [
|
|
||||||
"@@@STEP_NEST_LEVEL@1@@@"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"cmd": [
|
|
||||||
"chmod",
|
|
||||||
"755",
|
|
||||||
"[START_DIR]/cache/work"
|
|
||||||
],
|
|
||||||
"infra_step": true,
|
|
||||||
"name": "Docker setup.chmod 755 [START_DIR]/cache/work",
|
|
||||||
"~followup_annotations": [
|
|
||||||
"@@@STEP_NEST_LEVEL@1@@@"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"cmd": [
|
|
||||||
"chmod",
|
|
||||||
"0755",
|
|
||||||
"RECIPE_MODULE[skia::build]/resources/docker-compile.sh"
|
|
||||||
],
|
|
||||||
"infra_step": true,
|
|
||||||
"name": "Docker setup.chmod 0755 RECIPE_MODULE[skia::build]/resources/docker-compile.sh",
|
|
||||||
"~followup_annotations": [
|
|
||||||
"@@@STEP_NEST_LEVEL@1@@@"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"cmd": [
|
|
||||||
"docker",
|
|
||||||
"run",
|
|
||||||
"--shm-size=2gb",
|
|
||||||
"--rm",
|
|
||||||
"--mount",
|
|
||||||
"type=bind,source=[START_DIR]/cache/work,target=/SRC",
|
|
||||||
"--mount",
|
|
||||||
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Ubuntu18-GCC-x86_64-Release-Docker/Release,target=/OUT",
|
|
||||||
"gcr.io/skia-public/gcc-ubuntu18@sha256:3439bba135be1593de385f89b59e503ab28ef637ba634e2ecec43559dd928c69",
|
|
||||||
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-compile.sh",
|
|
||||||
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-ubuntu18@sha256:3439bba135be1593de385f89b59e503ab28ef637ba634e2ecec43559dd928c69\"] extra_ldflags=[] is_debug=false target_cpu=\"x86_64\" werror=true"
|
|
||||||
],
|
|
||||||
"env": {
|
|
||||||
"CHROME_HEADLESS": "1",
|
|
||||||
"DOCKER_CONFIG": "/home/chrome-bot/.docker",
|
|
||||||
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
|
|
||||||
},
|
|
||||||
"name": "Run build script in Docker"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"cmd": [
|
|
||||||
"python",
|
|
||||||
"-u",
|
|
||||||
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'hello-opencl', 'hello-opencl.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skottie_tool', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
|
|
||||||
"[START_DIR]/cache/work/skia/out/Build-Ubuntu18-GCC-x86_64-Release-Docker/Release",
|
|
||||||
"[START_DIR]/[SWARM_OUT_DIR]/out/Release"
|
|
||||||
],
|
|
||||||
"infra_step": true,
|
|
||||||
"name": "copy build products",
|
|
||||||
"~followup_annotations": [
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@import errno@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@import glob@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@import os@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@import shutil@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@build_products = ['dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'hello-opencl', 'hello-opencl.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skottie_tool', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@try:@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@ raise@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@for pattern in build_products:@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@",
|
|
||||||
"@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@",
|
|
||||||
"@@@STEP_LOG_END@python.inline@@@"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "$result"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
@ -21,7 +21,7 @@
|
|||||||
" return func(*a, **kw)",
|
" return func(*a, **kw)",
|
||||||
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/api.py\", line 61, in __call__",
|
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/api.py\", line 61, in __call__",
|
||||||
" self.compile_fn(self.m, checkout_root, out_dir)",
|
" self.compile_fn(self.m, checkout_root, out_dir)",
|
||||||
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/docker.py\", line 86, in compile_fn",
|
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/docker.py\", line 78, in compile_fn",
|
||||||
" raise Exception('Not implemented: ' + api.vars.builder_name)",
|
" raise Exception('Not implemented: ' + api.vars.builder_name)",
|
||||||
"Exception: Not implemented: Build-Unix-GCC-x86_64-Release-Docker"
|
"Exception: Not implemented: Build-Unix-GCC-x86_64-Release-Docker"
|
||||||
]
|
]
|
||||||
|
|||||||
@ -71,7 +71,6 @@ TEST_BUILDERS = [
|
|||||||
'Build-Mac-Clang-x86_64-Debug-CommandBuffer',
|
'Build-Mac-Clang-x86_64-Debug-CommandBuffer',
|
||||||
'Build-Mac-Clang-x86_64-Debug-Metal',
|
'Build-Mac-Clang-x86_64-Debug-Metal',
|
||||||
'Build-Mac-Clang-x86_64-Release-MoltenVK_Vulkan',
|
'Build-Mac-Clang-x86_64-Release-MoltenVK_Vulkan',
|
||||||
'Build-Ubuntu18-GCC-x86_64-Release-Docker',
|
|
||||||
'Build-Win-Clang-arm64-Release-Android',
|
'Build-Win-Clang-arm64-Release-Android',
|
||||||
'Build-Win-Clang-x86-Debug-Exceptions',
|
'Build-Win-Clang-x86-Debug-Exceptions',
|
||||||
'Build-Win-Clang-x86_64-Debug-OpenCL',
|
'Build-Win-Clang-x86_64-Debug-OpenCL',
|
||||||
|
|||||||
@ -576,11 +576,6 @@
|
|||||||
"Build-Mac-Clang-x86_64-Release-TSAN_Metal"
|
"Build-Mac-Clang-x86_64-Release-TSAN_Metal"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"Build-Ubuntu18-GCC-x86_64-Release-Docker": {
|
|
||||||
"tasks": [
|
|
||||||
"Build-Ubuntu18-GCC-x86_64-Release-Docker"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"Build-Win-Clang-arm64-Debug": {
|
"Build-Win-Clang-arm64-Debug": {
|
||||||
"tasks": [
|
"tasks": [
|
||||||
"Build-Win-Clang-arm64-Debug"
|
"Build-Win-Clang-arm64-Debug"
|
||||||
@ -11251,75 +11246,6 @@
|
|||||||
],
|
],
|
||||||
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
|
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
|
||||||
},
|
},
|
||||||
"Build-Ubuntu18-GCC-x86_64-Release-Docker": {
|
|
||||||
"caches": [
|
|
||||||
{
|
|
||||||
"name": "vpython",
|
|
||||||
"path": "cache/vpython"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "docker",
|
|
||||||
"path": "cache/docker"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"cipd_packages": [
|
|
||||||
{
|
|
||||||
"name": "infra/tools/luci/kitchen/${platform}",
|
|
||||||
"path": ".",
|
|
||||||
"version": "git_revision:0e171233385f11fd2b7458728c8ee439d4db53f1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "infra/tools/luci-auth/${platform}",
|
|
||||||
"path": "cipd_bin_packages",
|
|
||||||
"version": "git_revision:0e171233385f11fd2b7458728c8ee439d4db53f1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "infra/tools/luci/vpython/${platform}",
|
|
||||||
"path": "cipd_bin_packages",
|
|
||||||
"version": "git_revision:0e171233385f11fd2b7458728c8ee439d4db53f1"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"command": [
|
|
||||||
"cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
|
|
||||||
"skia/infra/bots/run_recipe.py",
|
|
||||||
"${ISOLATED_OUTDIR}",
|
|
||||||
"compile",
|
|
||||||
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Ubuntu18-GCC-x86_64-Release-Docker\",\"swarm_out_dir\":\"build\"}",
|
|
||||||
"skia"
|
|
||||||
],
|
|
||||||
"dependencies": [
|
|
||||||
"Housekeeper-PerCommit-BundleRecipes"
|
|
||||||
],
|
|
||||||
"dimensions": [
|
|
||||||
"cpu:x86-64-Haswell_GCE",
|
|
||||||
"gpu:none",
|
|
||||||
"machine_type:n1-standard-16",
|
|
||||||
"os:Debian-9.8",
|
|
||||||
"pool:Skia",
|
|
||||||
"docker_installed:true"
|
|
||||||
],
|
|
||||||
"env_prefixes": {
|
|
||||||
"PATH": [
|
|
||||||
"cipd_bin_packages",
|
|
||||||
"cipd_bin_packages/bin"
|
|
||||||
],
|
|
||||||
"VPYTHON_VIRTUALENV_ROOT": [
|
|
||||||
"cache/vpython"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"execution_timeout_ns": 3600000000000,
|
|
||||||
"extra_tags": {
|
|
||||||
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
|
|
||||||
},
|
|
||||||
"idempotent": true,
|
|
||||||
"io_timeout_ns": 3600000000000,
|
|
||||||
"isolate": "compile.isolate",
|
|
||||||
"max_attempts": 2,
|
|
||||||
"outputs": [
|
|
||||||
"build"
|
|
||||||
],
|
|
||||||
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
|
|
||||||
},
|
|
||||||
"Build-Win-Clang-arm64-Debug": {
|
"Build-Win-Clang-arm64-Debug": {
|
||||||
"caches": [
|
"caches": [
|
||||||
{
|
{
|
||||||
|
|||||||
@ -14,8 +14,3 @@ publish_Debian10-mips64el:
|
|||||||
docker tag gcc-debian10-mips64el gcr.io/skia-public/gcc-debian10-mips64el
|
docker tag gcc-debian10-mips64el gcr.io/skia-public/gcc-debian10-mips64el
|
||||||
docker push gcr.io/skia-public/gcc-debian10-mips64el
|
docker push gcr.io/skia-public/gcc-debian10-mips64el
|
||||||
|
|
||||||
publish_Ubuntu18:
|
|
||||||
docker build -t gcc-ubuntu18 ./Ubuntu18/
|
|
||||||
docker tag gcc-ubuntu18 gcr.io/skia-public/gcc-ubuntu18
|
|
||||||
docker push gcr.io/skia-public/gcc-ubuntu18
|
|
||||||
|
|
||||||
|
|||||||
@ -1,9 +0,0 @@
|
|||||||
FROM ubuntu:18.04
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
|
|
||||||
build-essential \
|
|
||||||
ca-certificates \
|
|
||||||
libfontconfig-dev \
|
|
||||||
libglu-dev \
|
|
||||||
python \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
Loading…
Reference in New Issue
Block a user