From f1243bad1b334673503283ad608cbf256fd2ae87 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Thu, 8 Sep 2022 21:15:35 -0700 Subject: [PATCH] Pin version of bazelisk to v1.13.0 (#12027) * Pin version of bazelisk to v1.13.0 This tries to avoid builds failures due to the latest version of bazelisk changing and causing hash mismatches. Signed-off-by: Saikrishna Arcot --- files/build/versions/default/versions-web | 6 +++--- .../versions/dockers/sonic-slave-bullseye/versions-web | 2 +- .../build/versions/dockers/sonic-slave-buster/versions-web | 2 +- .../build/versions/dockers/sonic-slave-stretch/versions-web | 2 +- sonic-slave-bullseye/Dockerfile.j2 | 2 +- sonic-slave-buster/Dockerfile.j2 | 2 +- sonic-slave-stretch/Dockerfile.j2 | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web index 128e6c8b47..ccd83299bf 100644 --- a/files/build/versions/default/versions-web +++ b/files/build/versions/default/versions-web @@ -38,8 +38,8 @@ https://deb.nodesource.com/setup_14.x==b692a224c718ad6e1cbd17eda8aaa673 https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220408_sai_1.9.1_deb10.deb==890a53ca1374dfcf8c12091d74fd2ef8 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220408_sai_1.9.1_deb10.deb==a54c351ee84ddb63837085272a1c4eae -https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-amd64==1227b24db77557d552701f6add122edc -https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-arm64==9d20e147b108fb9638dd65b1ad9a1503 +https://github.com/bazelbuild/bazelisk/releases/download/v1.13.0/bazelisk-linux-amd64==1227b24db77557d552701f6add122edc +https://github.com/bazelbuild/bazelisk/releases/download/v1.13.0/bazelisk-linux-arm64==9d20e147b108fb9638dd65b1ad9a1503 https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/sai/libsai_1.9.1-0_amd64.deb==08e1a82bd42ca1cba08fd6deec43c02a https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/third_party/advantech/_Susi4.so==5e1b8daef522c9da00af400abe25810b https://github.com/CentecNetworks/sonic-binaries/raw/master/amd64/third_party/advantech/libSUSI-4.00.so.1==393a94b0abba146777e276e1febe0cb0 @@ -126,4 +126,4 @@ https://sonicstorage.blob.core.windows.net/public/fips/bullseye/0.2/arm64/python https://sonicstorage.blob.core.windows.net/public/fips/bullseye/0.2/arm64/symcrypt-openssl_0.2_arm64.deb==8a61d4d4617985f5e3247ec2010d956c https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282 https://storage.googleapis.com/golang/go1.14.2.linux-arm64.tar.gz==e5f79b403701e00f20d13f0ea561b064 -https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be \ No newline at end of file +https://storage.googleapis.com/golang/go1.14.2.linux-armv6l.tar.gz==04467414e783b18de4278e9f24baf4be diff --git a/files/build/versions/dockers/sonic-slave-bullseye/versions-web b/files/build/versions/dockers/sonic-slave-bullseye/versions-web index 80e5c744f0..5a1aea64f2 100644 --- a/files/build/versions/dockers/sonic-slave-bullseye/versions-web +++ b/files/build/versions/dockers/sonic-slave-bullseye/versions-web @@ -1,4 +1,4 @@ https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15 -https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-amd64==1227b24db77557d552701f6add122edc +https://github.com/bazelbuild/bazelisk/releases/download/v1.13.0/bazelisk-linux-amd64==1227b24db77557d552701f6add122edc https://sonicstorage.blob.core.windows.net/public/fips/bullseye/0.1/amd64/golang-1.15-go_1.15.15-1~deb11u4%2Bfips_amd64.deb==b60f6db62805696b47ab422ab798fe56 https://sonicstorage.blob.core.windows.net/public/fips/bullseye/0.1/amd64/golang-1.15-src_1.15.15-1~deb11u4%2Bfips_amd64.deb==1c920937aa49b602a1bfec3c49747131 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-web b/files/build/versions/dockers/sonic-slave-buster/versions-web index 03527784c5..ce8ec0886c 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-web +++ b/files/build/versions/dockers/sonic-slave-buster/versions-web @@ -1,3 +1,3 @@ https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15 -https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-amd64==1227b24db77557d552701f6add122edc +https://github.com/bazelbuild/bazelisk/releases/download/v1.13.0/bazelisk-linux-amd64==1227b24db77557d552701f6add122edc https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-web b/files/build/versions/dockers/sonic-slave-stretch/versions-web index e527c7938c..12628a4c4c 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-web +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-web @@ -1,5 +1,5 @@ https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15 -https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-amd64==1227b24db77557d552701f6add122edc +https://github.com/bazelbuild/bazelisk/releases/download/v1.13.0/bazelisk-linux-amd64==1227b24db77557d552701f6add122edc https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275 https://storage.googleapis.com/golang/go1.14.2.linux-amd64.tar.gz==856d248e3ea8a287d13e5f6afd086282 \ No newline at end of file diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2 index b55888da88..f172317cb1 100644 --- a/sonic-slave-bullseye/Dockerfile.j2 +++ b/sonic-slave-bullseye/Dockerfile.j2 @@ -534,7 +534,7 @@ LABEL "com.azure.dev.pipelines.agent.handler.node.path"="/usr/bin/node" # Install Bazel build system (amd64 and arm64 architectures are supported using this method) # TODO(PINS): Remove once pre-build Bazel binaries are available for armhf (armv7l) {%- if CONFIGURED_ARCH == "amd64" or CONFIGURED_ARCH == "arm64" %} -ARG bazelisk_url=https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-{{ CONFIGURED_ARCH }} +ARG bazelisk_url=https://github.com/bazelbuild/bazelisk/releases/download/v1.13.0/bazelisk-linux-{{ CONFIGURED_ARCH }} RUN curl -fsSL -o /usr/local/bin/bazel ${bazelisk_url} && chmod 755 /usr/local/bin/bazel # Bazel requires "python" # TODO(PINS): remove when Bazel is okay with "python3" binary name diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index 2f3cadf0a4..9c9378ec0c 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -561,6 +561,6 @@ LABEL "com.azure.dev.pipelines.agent.handler.node.path"="/usr/bin/node" # Install Bazel build system (amd64 and arm64 architectures are supported using this method) # TODO(PINS): Remove once pre-build Bazel binaries are available for armhf (armv7l) {%- if CONFIGURED_ARCH == "amd64" or CONFIGURED_ARCH == "arm64" %} -ARG bazelisk_url=https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-{{ CONFIGURED_ARCH }} +ARG bazelisk_url=https://github.com/bazelbuild/bazelisk/releases/download/v1.13.0/bazelisk-linux-{{ CONFIGURED_ARCH }} RUN curl -fsSL -o /usr/local/bin/bazel ${bazelisk_url} && chmod 755 /usr/local/bin/bazel {% endif -%} diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2 index e3815eab2d..39554633eb 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -463,6 +463,6 @@ LABEL "com.azure.dev.pipelines.agent.handler.node.path"="/usr/bin/node" # Install Bazel build system (amd64 and arm64 architectures are supported using this method) # TODO(PINS): Remove once pre-build Bazel binaries are available for armhf (armv7l) {%- if CONFIGURED_ARCH == "amd64" or CONFIGURED_ARCH == "arm64" %} -ARG bazelisk_url=https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-{{ CONFIGURED_ARCH }} +ARG bazelisk_url=https://github.com/bazelbuild/bazelisk/releases/download/v1.13.0/bazelisk-linux-{{ CONFIGURED_ARCH }} RUN curl -fsSL -o /usr/local/bin/bazel ${bazelisk_url} && chmod 755 /usr/local/bin/bazel {% endif -%}