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

FLASH-200: Fix CI build fake pass #22

Merged
merged 6 commits into from
Mar 28, 2019
Merged

FLASH-200: Fix CI build fake pass #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
81d7e83
Fix builder image
zanmato1984 Mar 27, 2019
98e9e90
Update docker file
zanmato1984 Mar 27, 2019
13cc998
Add -xe for build shell
zanmato1984 Mar 27, 2019
c888e1f
Add -xe to test script
zanmato1984 Mar 27, 2019
419a9d3
Pass bash command return code out to docker compose exec
zanmato1984 Mar 27, 2019
07668da
Add -xe to run-test script
zyguan Mar 28, 2019
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
8 changes: 4 additions & 4 deletions docker/builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
FROM ubuntu:17.10
FROM ubuntu:18.04

RUN apt update -y && \
apt install -y cmake libssl-dev libcrypto++-dev \
libglib2.0-dev libltdl-dev libicu-dev libmysql++-dev \
libreadline-dev libmysqlclient-dev unixodbc-dev \
unixodbc-dev devscripts dupload fakeroot debhelper \
gcc-7 g++-7 unixodbc-dev devscripts dupload fakeroot debhelper \
liblld-5.0-dev libclang-5.0-dev liblld-5.0
# For tests: # bash expect python python-lxml python-termcolor curl perl sudo tzdata

RUN apt install -y build-essential autoconf libtool pkg-config
RUN apt install -y libgflags-dev libgtest-dev
RUN apt install -y clang-5.0 libc++-dev
RUN apt install -y golang

RUN git clone https://github.com/curl/curl.git
RUN cd /curl && mkdir .build && cd .build && cmake .. && make && make install

RUN git clone https://github.com/grpc/grpc.git && cd grpc && git checkout v1.14.2 && git submodule update --init
RUN cd /grpc && mkdir .build && cd .build && CC=/usr/lib/llvm-5.0/bin/clang CXX=/usr/lib/llvm-5.0/bin/clang++ cmake .. -DgRPC_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release && make install -j $(nproc || grep -c ^processor /proc/cpuinfo)
RUN cd /grpc && rm -rf .build && mkdir .build && cd .build && CC=/usr/lib/llvm-5.0/bin/clang CXX=/usr/lib/llvm-5.0/bin/clang++ && cmake .. -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_CARES_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DCMAKE_BUILD_TYPE=Release && make install -j $(nproc || grep -c ^processor /proc/cpuinfo)
RUN cd /grpc && mkdir .build && cd .build && cmake .. -DgRPC_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release && make install -j $(nproc || grep -c ^processor /proc/cpuinfo)
RUN cd /grpc && rm -rf .build && mkdir .build && cd .build && cmake .. -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_CARES_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DCMAKE_BUILD_TYPE=Release && make install -j $(nproc || grep -c ^processor /proc/cpuinfo)

ADD build.sh /
RUN chmod +x /build.sh
Expand Down
2 changes: 1 addition & 1 deletion docker/builder/Dockerfile-tics
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:17.10
FROM ubuntu:18.04

RUN apt update && \
apt install -y tzdata python
Expand Down
4 changes: 3 additions & 1 deletion docker/builder/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#!/bin/bash

set -xe

mkdir -p /server/build_docker
cd /server/contrib/kvproto
./generate_cpp.sh
cd /server/build_docker
CC=/usr/lib/llvm-5.0/bin/clang CXX=/usr/lib/llvm-5.0/bin/clang++ LLVM_ROOT=/usr/lib/llvm-5.0 cmake /server -DENABLE_EMBEDDED_COMPILER=1 -DENABLE_TESTS=0
cmake /server -DENABLE_EMBEDDED_COMPILER=1 -DENABLE_TESTS=0
make -j $(nproc || grep -c ^processor /proc/cpuinfo) theflash
#ctest -V -j $(nproc || grep -c ^processor /proc/cpuinfo)

Expand Down
2 changes: 2 additions & 0 deletions tests/docker/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

set -xe

docker-compose down

rm -rf ./data ./log
Expand Down
2 changes: 2 additions & 0 deletions tests/run-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ function run_path()
fi
}

set -xe

target="$1"
fuzz="$2"
skip_raw_test="$3"
Expand Down