Fix Build-Debian9-Clang-arm-Release-Flutter_Android_Docker job.
Replace Python 2 with Python 3 on Debian 9 Docker image, since jobs
peter out with `/usr/bin/env: 'python3': No such file or directory`.
Change-Id: I0041c408b4e889ba6985193e5f446e477bbd8705
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438079
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Erik Rose <erikrose@google.com>
diff --git a/infra/bots/recipe_modules/build/chromebook.py b/infra/bots/recipe_modules/build/chromebook.py
index af416d2..2dc8db4 100644
--- a/infra/bots/recipe_modules/build/chromebook.py
+++ b/infra/bots/recipe_modules/build/chromebook.py
@@ -9,7 +9,7 @@
# Used to build ChromeOS for Pixelbook in Debian9, to align GLIBC versions.
'Debian9': (
'gcr.io/skia-public/debian9@sha256:'
- 'f48edc56b621a44ee2f985555f9b09c2802da15d56bb4e43666faabbec80d569'),
+ '7bdcb25e8c37597acd254b0c5b4ff8d004745eddede3363213bcc06fb0feace3'),
}
def compile_fn(api, checkout_root, out_dir):
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Flutter_Android_Docker.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Flutter_Android_Docker.json
index 70a1540..c333dcc 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Flutter_Android_Docker.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-arm-Release-Flutter_Android_Docker.json
@@ -83,7 +83,7 @@
"type=bind,source=[START_DIR],target=[START_DIR]",
"--mount",
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Flutter_Android_Docker/Release,target=[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-arm-Release-Flutter_Android_Docker/Release",
- "gcr.io/skia-public/debian9@sha256:f48edc56b621a44ee2f985555f9b09c2802da15d56bb4e43666faabbec80d569",
+ "gcr.io/skia-public/debian9@sha256:7bdcb25e8c37597acd254b0c5b4ff8d004745eddede3363213bcc06fb0feace3",
"RECIPE_MODULE[skia::build]/resources/docker-flutter-compile.sh",
"[START_DIR]",
"[START_DIR]/cache/work/src",
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker.json
index 5be2d9e..7069f1c 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker.json
@@ -101,9 +101,9 @@
"type=bind,source=[START_DIR]/cache/work,target=/SRC",
"--mount",
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker/Debug,target=/OUT",
- "gcr.io/skia-public/debian9@sha256:f48edc56b621a44ee2f985555f9b09c2802da15d56bb4e43666faabbec80d569",
+ "gcr.io/skia-public/debian9@sha256:7bdcb25e8c37597acd254b0c5b4ff8d004745eddede3363213bcc06fb0feace3",
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-chromeos-compile.sh",
- "cc=\"/SRC/clang_linux/bin/clang\" cxx=\"/SRC/clang_linux/bin/clang++\" extra_asmflags=[] extra_cflags=[\"-DMESA_EGL_NO_X11_HEADERS\",\"-I/SRC/chromebook_x86_64_gles/include\",\"-DREBUILD_IF_CHANGED_clang_linux_version=42\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/debian9@sha256:f48edc56b621a44ee2f985555f9b09c2802da15d56bb4e43666faabbec80d569\"] extra_ldflags=[\"-L/SRC/chromebook_x86_64_gles/lib\",\"-static-libstdc++\",\"-static-libgcc\",\"-fuse-ld=lld\"] skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"x86_64\" werror=true"
+ "cc=\"/SRC/clang_linux/bin/clang\" cxx=\"/SRC/clang_linux/bin/clang++\" extra_asmflags=[] extra_cflags=[\"-DMESA_EGL_NO_X11_HEADERS\",\"-I/SRC/chromebook_x86_64_gles/include\",\"-DREBUILD_IF_CHANGED_clang_linux_version=42\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/debian9@sha256:7bdcb25e8c37597acd254b0c5b4ff8d004745eddede3363213bcc06fb0feace3\"] extra_ldflags=[\"-L/SRC/chromebook_x86_64_gles/lib\",\"-static-libstdc++\",\"-static-libgcc\",\"-fuse-ld=lld\"] skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"x86_64\" werror=true"
],
"env": {
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker.json
index 4d1b853..984c9f5 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker.json
@@ -101,9 +101,9 @@
"type=bind,source=[START_DIR]/cache/work,target=/SRC",
"--mount",
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker/Release,target=/OUT",
- "gcr.io/skia-public/debian9@sha256:f48edc56b621a44ee2f985555f9b09c2802da15d56bb4e43666faabbec80d569",
+ "gcr.io/skia-public/debian9@sha256:7bdcb25e8c37597acd254b0c5b4ff8d004745eddede3363213bcc06fb0feace3",
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-chromeos-compile.sh",
- "cc=\"/SRC/clang_linux/bin/clang\" cxx=\"/SRC/clang_linux/bin/clang++\" extra_asmflags=[] extra_cflags=[\"-DMESA_EGL_NO_X11_HEADERS\",\"-I/SRC/chromebook_x86_64_gles/include\",\"-DREBUILD_IF_CHANGED_clang_linux_version=42\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/debian9@sha256:f48edc56b621a44ee2f985555f9b09c2802da15d56bb4e43666faabbec80d569\"] extra_ldflags=[\"-L/SRC/chromebook_x86_64_gles/lib\",\"-static-libstdc++\",\"-static-libgcc\",\"-fuse-ld=lld\"] is_debug=false skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"x86_64\" werror=true"
+ "cc=\"/SRC/clang_linux/bin/clang\" cxx=\"/SRC/clang_linux/bin/clang++\" extra_asmflags=[] extra_cflags=[\"-DMESA_EGL_NO_X11_HEADERS\",\"-I/SRC/chromebook_x86_64_gles/include\",\"-DREBUILD_IF_CHANGED_clang_linux_version=42\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/debian9@sha256:7bdcb25e8c37597acd254b0c5b4ff8d004745eddede3363213bcc06fb0feace3\"] extra_ldflags=[\"-L/SRC/chromebook_x86_64_gles/lib\",\"-static-libstdc++\",\"-static-libgcc\",\"-fuse-ld=lld\"] is_debug=false skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"x86_64\" werror=true"
],
"env": {
"CHROME_HEADLESS": "1",
diff --git a/infra/bots/recipe_modules/build/flutter.py b/infra/bots/recipe_modules/build/flutter.py
index 9f8387b..6833613 100644
--- a/infra/bots/recipe_modules/build/flutter.py
+++ b/infra/bots/recipe_modules/build/flutter.py
@@ -9,7 +9,7 @@
# scripts require jdk8.
'Debian9': (
'gcr.io/skia-public/debian9@sha256:'
- 'f48edc56b621a44ee2f985555f9b09c2802da15d56bb4e43666faabbec80d569'),
+ '7bdcb25e8c37597acd254b0c5b4ff8d004745eddede3363213bcc06fb0feace3'),
}
def compile_fn(api, checkout_root, out_dir):
diff --git a/infra/docker/debian9/Dockerfile b/infra/docker/debian9/Dockerfile
index 0ad3446..039e4c8 100644
--- a/infra/docker/debian9/Dockerfile
+++ b/infra/docker/debian9/Dockerfile
@@ -17,7 +17,7 @@
g++-multilib \
openjdk-8-jdk-headless \
libxi-dev \
- python-django \
+ python3-django \
libc++-dev \
libc++abi-dev \
gperf \
@@ -25,6 +25,6 @@
usbutils \
libfontconfig-dev \
libglu-dev \
- python \
+ python3 \
git \
&& rm -rf /var/lib/apt/lists/*