From b60a154bb77e39cf09c7a3cba23ec45f9b519640 Mon Sep 17 00:00:00 2001 From: Takashi Matsuo Date: Thu, 18 Jun 2020 21:49:40 +0000 Subject: [PATCH 1/3] testing: update the python versions in the Dockerfile also enable the Docker image upload in python 3.8 periodic build. --- .kokoro/docker/Dockerfile | 2 +- .kokoro/python3.8/periodic.cfg | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.kokoro/docker/Dockerfile b/.kokoro/docker/Dockerfile index 924f427a530..3c01a981c6e 100644 --- a/.kokoro/docker/Dockerfile +++ b/.kokoro/docker/Dockerfile @@ -92,7 +92,7 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ && rm -f /var/cache/apt/archives/*.deb # Install the desired versions of Python. -RUN for PYTHON_VERSION in 2.7.17 3.6.9 3.7.5 3.8.0; do \ +RUN for PYTHON_VERSION in 2.7.17 3.6.10 3.7.7 3.8.3; do \ set -ex \ && wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \ && wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \ diff --git a/.kokoro/python3.8/periodic.cfg b/.kokoro/python3.8/periodic.cfg index f962097d226..86f13817c22 100644 --- a/.kokoro/python3.8/periodic.cfg +++ b/.kokoro/python3.8/periodic.cfg @@ -24,3 +24,9 @@ env_vars: { key: "REPORT_TO_BUILD_COP_BOT" value: "true" } + +# Tell Trampoline to upload the Docker image after successfull build. +env_vars: { + key: "TRAMPOLINE_IMAGE_UPLOAD" + value: "true" +} From 084d7b8bcd5abdf0b175ee8330ba66daedd6fabc Mon Sep 17 00:00:00 2001 From: Takashi Matsuo Date: Thu, 18 Jun 2020 22:32:03 +0000 Subject: [PATCH 2/3] use Python 2.7.18 --- .kokoro/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/docker/Dockerfile b/.kokoro/docker/Dockerfile index 3c01a981c6e..d5563e1ed30 100644 --- a/.kokoro/docker/Dockerfile +++ b/.kokoro/docker/Dockerfile @@ -92,7 +92,7 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ && rm -f /var/cache/apt/archives/*.deb # Install the desired versions of Python. -RUN for PYTHON_VERSION in 2.7.17 3.6.10 3.7.7 3.8.3; do \ +RUN for PYTHON_VERSION in 2.7.18 3.6.10 3.7.7 3.8.3; do \ set -ex \ && wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \ && wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \ From 6bf95d6cdcb3600674509246d072466267e3dfcc Mon Sep 17 00:00:00 2001 From: Takashi Matsuo Date: Fri, 19 Jun 2020 01:33:38 +0000 Subject: [PATCH 3/3] ensure build failure upon signature verification failure --- .kokoro/docker/Dockerfile | 41 ++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.kokoro/docker/Dockerfile b/.kokoro/docker/Dockerfile index d5563e1ed30..5f065d692fc 100644 --- a/.kokoro/docker/Dockerfile +++ b/.kokoro/docker/Dockerfile @@ -92,10 +92,7 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ && rm -f /var/cache/apt/archives/*.deb # Install the desired versions of Python. -RUN for PYTHON_VERSION in 2.7.18 3.6.10 3.7.7 3.8.3; do \ - set -ex \ - && wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \ - && wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \ +RUN set -ex \ && export GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \ # 2.7.17 (Benjamin Peterson) @@ -106,23 +103,27 @@ RUN for PYTHON_VERSION in 2.7.18 3.6.10 3.7.7 3.8.3; do \ 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D \ # 3.8.0 (Łukasz Langa) E3FF2839C048B25C084DEBE9B26995E310250568 \ - && gpg --batch --verify python-${PYTHON_VERSION}.tar.xz.asc python-${PYTHON_VERSION}.tar.xz \ - && rm -r "$GNUPGHOME" python-${PYTHON_VERSION}.tar.xz.asc \ - && mkdir -p /usr/src/python-${PYTHON_VERSION} \ - && tar -xJC /usr/src/python-${PYTHON_VERSION} --strip-components=1 -f python-${PYTHON_VERSION}.tar.xz \ - && rm python-${PYTHON_VERSION}.tar.xz \ - && cd /usr/src/python-${PYTHON_VERSION} \ - && ./configure \ - --enable-shared \ - # This works only on Python 2.7 and throws a warning on every other - # version, but seems otherwise harmless. - --enable-unicode=ucs4 \ - --with-system-ffi \ - --without-ensurepip \ - && make -j$(nproc) \ - && make install \ - && ldconfig \ + && for PYTHON_VERSION in 2.7.18 3.6.10 3.7.7 3.8.3; do \ + wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \ + && wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \ + && gpg --batch --verify python-${PYTHON_VERSION}.tar.xz.asc python-${PYTHON_VERSION}.tar.xz \ + && rm -r python-${PYTHON_VERSION}.tar.xz.asc \ + && mkdir -p /usr/src/python-${PYTHON_VERSION} \ + && tar -xJC /usr/src/python-${PYTHON_VERSION} --strip-components=1 -f python-${PYTHON_VERSION}.tar.xz \ + && rm python-${PYTHON_VERSION}.tar.xz \ + && cd /usr/src/python-${PYTHON_VERSION} \ + && ./configure \ + --enable-shared \ + # This works only on Python 2.7 and throws a warning on every other + # version, but seems otherwise harmless. + --enable-unicode=ucs4 \ + --with-system-ffi \ + --without-ensurepip \ + && make -j$(nproc) \ + && make install \ + && ldconfig \ ; done \ + && rm -r "${GNUPGHOME}" \ && rm -rf /usr/src/python* \ && rm -rf ~/.cache/