Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix failures for solutions pipeline #1506

Merged
merged 2 commits into from
Oct 31, 2023
Merged

Fix failures for solutions pipeline #1506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d92b662
Fix build failure
Oct 30, 2023
63dcd93
Format git clone command
Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion solutions/cpprestsdk/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN rm -rf /app;mkdir -p /app
WORKDIR /app

ADD skip-tests.patch .
RUN git clone https://github.com/Microsoft/cpprestsdk.git casablanca
RUN git clone --depth 1 --single-branch https://github.com/Microsoft/cpprestsdk.git casablanca
# apply patch to skip un-wanted tests and compile
RUN cd casablanca;\
git apply ../skip-tests.patch;\
Expand Down
2 changes: 1 addition & 1 deletion solutions/cpython-tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN wget https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.ta
make && \
make install

RUN git clone --depth 1 --branch $CPYTHON_TAG https://github.com/python/cpython
RUN git clone --depth 1 --single-branch --branch $CPYTHON_TAG https://github.com/python/cpython
WORKDIR /cpython
# Apply patch to skip certain unit tests
COPY ./test_config_$CPYTHON_TAG/patch /cpython/
Expand Down
4 changes: 2 additions & 2 deletions solutions/msgpack_c/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ RUN cd googletest-release-1.7.0; \
mv *.a /usr/lib;cp -r ../include/gtest /usr/include

# clone and compile msgpack repo
RUN git clone --single-branch --branch cpp_master https://github.com/msgpack/msgpack-c.git msgpack
RUN git clone --depth 1 --single-branch --branch cpp-3.3.0 https://github.com/msgpack/msgpack-c.git msgpack
RUN mkdir -p /app/msgpack/build; \
cd /app/msgpack/build;git checkout cpp-3.3.0; cmake ..;make
cd /app/msgpack/build;cmake ..;make
RUN mkdir -p /app/tests
# filter and copy all executable test binaries to another directory
RUN cd /app/msgpack/build/test; \
Expand Down
2 changes: 1 addition & 1 deletion solutions/python_azure_sdk/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG PACKAGES
RUN apt update && apt install -y git

WORKDIR /
RUN git clone -b ${TAG} https://github.com/Azure/azure-sdk-for-python --single-branch --depth 1
RUN git clone --depth 1 --single-branch --branch ${TAG} https://github.com/Azure/azure-sdk-for-python
ADD install-dev-requirements.sh ${PACKAGES} /
RUN chmod +x /install-dev-requirements.sh \
&& /install-dev-requirements.sh
4 changes: 2 additions & 2 deletions solutions/python_flask_tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ FROM python:3.9-slim-bullseye
WORKDIR /app

RUN apt update && apt install -y git
# Checkout Flask v2.3.2
RUN git clone https://github.com/pallets/flask && cd flask && git checkout f3b8f570545200c87465d18386f3fc9f2258307a
# Checkout Flask v2.3.3
RUN git clone --depth 1 --single-branch --branch 2.3.3 https://github.com/pallets/flask

WORKDIR /app/flask

Expand Down
2 changes: 1 addition & 1 deletion solutions/python_web_frameworks/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3-alpine
FROM python:3.11-alpine

RUN apk add --update --no-cache python3-dev build-base pcre-dev linux-headers
RUN pip install flask uwsgi
Expand Down
2 changes: 1 addition & 1 deletion solutions/pytorch_tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ RUN pip3 install pytest expecttest hypothesis==6.52.1 && \
pip3 install torch==1.10.0+cpu torchvision==0.11.1+cpu torchaudio==0.10.0+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html

WORKDIR /workspace
RUN git clone -b ${TAG} https://github.com/pytorch/pytorch.git --single-branch --depth 1
RUN git clone --depth 1 --single-branch --branch ${TAG} https://github.com/pytorch/pytorch.git
WORKDIR /workspace/pytorch
2 changes: 1 addition & 1 deletion solutions/pytorch_tests/Dockerfile-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN curl -fsSL -v -o ~/miniconda.sh -O https://repo.anaconda.com/miniconda/Mini
FROM dev-base as submodule-update
ARG PYTORCH_VERSION=v1.10.0
WORKDIR /opt
RUN git clone -b ${PYTORCH_VERSION} https://github.com/pytorch/pytorch.git --single-branch --depth 1
RUN git clone --depth 1 --single-branch --branch ${PYTORCH_VERSION} https://github.com/pytorch/pytorch.git
WORKDIR /opt/pytorch
RUN git submodule update --init --recursive --jobs 0

Expand Down
2 changes: 1 addition & 1 deletion tests/aspnetcore5/Dockerfile.aspnet5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-a50a721-2019112020
ARG TAG=v5.0.11

WORKDIR /app
RUN git clone --branch ${TAG} --recursive https://github.com/dotnet/aspnetcore
RUN git clone --depth 1 --single-branch --recurse-submodules --branch ${TAG} https://github.com/dotnet/aspnetcore
WORKDIR /app/aspnetcore
RUN ./build.sh -nobl -c Debug \
--arch x64 --all \
Expand Down
2 changes: 1 addition & 1 deletion tests/aspnetcore6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-a50a721-2019112020
ARG TAG=v6.0.0-preview.2.21154.6

WORKDIR /app
RUN git clone --branch ${TAG} --recursive https://github.com/dotnet/aspnetcore
RUN git clone --depth 1 --single-branch --recurse-submodules --branch ${TAG} https://github.com/dotnet/aspnetcore
WORKDIR /app/aspnetcore
RUN ./eng/build.sh -nobl -c Debug \
--arch x64 --all \
Expand Down
6 changes: 4 additions & 2 deletions tests/azure-sdk-for-cpp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ RUN apk update && apk upgrade \
&& apk add --no-cache build-base curl zip unzip tar openssl-dev curl-dev \
&& apk add --no-cache g++ wget libxml2-dev make ninja gcc cmake git

RUN git clone https://github.com/Azure/azure-sdk-for-cpp.git
# Previously this Dockerfile checkouts commit 8fcc1df085eb7dad87084813e19fa6c362bb6734
# But git clone doesn't support cloning at a specific commit, so replaced with a tag that include commit 8fcc1df
RUN git clone --depth 1 --single-branch --branch azure-storage-common_12.1.0 https://github.com/Azure/azure-sdk-for-cpp.git

RUN cd azure-sdk-for-cpp && git checkout 8fcc1df085eb7dad87084813e19fa6c362bb6734 \
RUN cd azure-sdk-for-cpp \
&& mkdir build && cd build \
&& cmake .. -DBUILD_TRANSPORT_CURL=ON -DCMAKE_BUILD_TYPE=Debug -DBUILD_STORAGE_SAMPLES=ON -DBUILD_TESTING=ON \
&& cmake --build .
4 changes: 2 additions & 2 deletions tests/azure-sdk-for-cpp/Dockerfile-ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ FROM ubuntu:20.04

RUN apt-get update && apt-get install -y curl zip unzip tar git g++ wget build-essential libssl-dev libcurl4-openssl-dev libxml2-dev cmake

RUN git clone https://github.com/microsoft/vcpkg
RUN git clone --depth 1 --single-branch https://github.com/microsoft/vcpkg

RUN ./vcpkg/bootstrap-vcpkg.sh

RUN git clone https://github.com/Azure/azure-sdk-for-cpp.git
RUN git clone --depth 1 --single-branch https://github.com/Azure/azure-sdk-for-cpp.git

RUN cd azure-sdk-for-cpp && mkdir build && cd build \
&& cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_STORAGE_SAMPLES=ON -DBUILD_TESTING=ON \
Expand Down
2 changes: 1 addition & 1 deletion tests/coreclr/p0-net6.0-ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-20200508132555-78cbb55 as builder

WORKDIR /build
RUN git clone --single-branch --branch release/6.0 https://github.com/dotnet/runtime.git
RUN git clone --depth 1 --single-branch --branch release/6.0 https://github.com/dotnet/runtime.git
WORKDIR /build/runtime/

# Build clr+libs+clr.tests in debug
Expand Down
2 changes: 1 addition & 1 deletion tests/coreclr/p0-net6.0-ubuntu/Dockerfile.release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-20200508132555-78cbb55 as builder

WORKDIR /build
RUN git clone --single-branch --branch release/6.0 https://github.com/dotnet/runtime.git
RUN git clone --depth 1 --single-branch --branch release/6.0 https://github.com/dotnet/runtime.git
WORKDIR /build/runtime/

# Build clr+libs+clr.tests in release
Expand Down
2 changes: 1 addition & 1 deletion tests/coreclr/p1-net6.0-ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-20210311173918-cb64fc0 as builder

WORKDIR /build
RUN git clone --single-branch --branch release/6.0 https://github.com/dotnet/runtime.git
RUN git clone --depth 1 --single-branch --branch release/6.0 https://github.com/dotnet/runtime.git
WORKDIR /build/runtime/

# Build clr+libs+clr.tests in debug
Expand Down
2 changes: 1 addition & 1 deletion tests/coreclr/p1-net6.0-ubuntu/Dockerfile.release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-20210311173918-cb64fc0 as builder

WORKDIR /build
RUN git clone --single-branch --branch release/6.0 https://github.com/dotnet/runtime.git
RUN git clone --depth 1 --single-branch --branch release/6.0 https://github.com/dotnet/runtime.git
WORKDIR /build/runtime/

# Build clr+libs+clr.tests in release
Expand Down
2 changes: 1 addition & 1 deletion tests/glibc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y \

# checkout glibc
WORKDIR /
RUN git clone -b ${TAG} https://sourceware.org/git/glibc.git
RUN git clone --depth 1 --single-branch --branch ${TAG} https://sourceware.org/git/glibc.git
WORKDIR /glibc
COPY patch.diff .
RUN git apply patch.diff
Expand Down
2 changes: 1 addition & 1 deletion tests/sockperf/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM alpine:3.7 as builder
RUN apk update && apk upgrade
RUN apk add build-base perl make automake autoconf m4 git libexecinfo-dev

RUN git clone -b sockperf_v2 --single-branch https://github.com/Mellanox/sockperf.git
RUN git clone --single-branch --branch sockperf_v2 https://github.com/Mellanox/sockperf.git

WORKDIR /sockperf

Expand Down
2 changes: 1 addition & 1 deletion tests/sockperf/Dockerfile_ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM ubuntu:20.04 as builder
RUN apt-get update && apt-get install -y \
build-essential perl make automake autoconf m4 git libtool-bin

RUN git clone -b sockperf_v2 --single-branch https://github.com/Mellanox/sockperf.git
RUN git clone --single-branch --branch sockperf_v2 https://github.com/Mellanox/sockperf.git

WORKDIR /sockperf

Expand Down