Compare commits

...

2 Commits

Author SHA1 Message Date
Thomas Carmet 1355d589f5 Add lfs content into build context for warp10 2021-05-20 10:59:22 -07:00
Taylor McKinnon d71cb8df04 bf(S3C-4424): Switch protobuf extension to use git lfs 2021-05-20 10:37:35 -07:00
6 changed files with 40 additions and 10 deletions

View File

@ -27,13 +27,30 @@ models:
source: /artifacts
urls:
- "*"
- ShellCommand: &fetch_lfs
name: fetch lfs files
usePTY: True
command: >
set -exv;
unset HTTPS_PROXY;
unset HTTP_PROXY;
unset http_proxy;
unset https_proxy;
git lfs fetch;
git lfs pull;
haltOnFailure: True
stages:
pre-merge:
worker:
type: local
steps:
- ShellCommand:
name: Pull LFS content on Master build
command: |
git lfs fetch
git lfs pull
workdir: "%(prop:master_builddir)s/build"
- TriggerStages:
name: trigger all the tests
stage_names:
@ -49,6 +66,7 @@ stages:
worker: *workspace
steps:
- Git: *clone
- ShellCommand: *fetch_lfs
- ShellCommand:
name: run static analysis tools on markdown
command: yarn run lint_md
@ -66,6 +84,7 @@ stages:
worker: *workspace
steps:
- Git: *clone
- ShellCommand: *fetch_lfs
- ShellCommand:
name: run client tests
command: bash ./eve/workers/unit_and_feature_tests/run_ft_tests.bash false ft_test:client
@ -77,6 +96,7 @@ stages:
worker: *workspace
steps:
- Git: *clone
- ShellCommand: *fetch_lfs
- ShellCommand:
name: run server tests
command: bash ./eve/workers/unit_and_feature_tests/run_ft_tests.bash false ft_test:server
@ -88,6 +108,7 @@ stages:
worker: *workspace
steps:
- Git: *clone
- ShellCommand: *fetch_lfs
- ShellCommand:
name: run cron tests
command: bash ./eve/workers/unit_and_feature_tests/run_ft_tests.bash false ft_test:cron
@ -99,6 +120,7 @@ stages:
worker: *workspace
steps:
- Git: *clone
- ShellCommand: *fetch_lfs
- ShellCommand:
name: run interval tests
command: bash ./eve/workers/unit_and_feature_tests/run_ft_tests.bash true ft_test:interval
@ -113,6 +135,7 @@ stages:
vault: enabled
steps:
- Git: *clone
- ShellCommand: *fetch_lfs
- ShellCommand:
name: Wait for Warp 10
command: |
@ -143,6 +166,7 @@ stages:
vault: enabled
steps:
- Git: *clone
- ShellCommand: *fetch_lfs
- ShellCommand:
name: Wait for Warp 10
command: |

View File

@ -1,4 +1,4 @@
FROM buildpack-deps:jessie-curl
FROM buildpack-deps:focal-curl
#
# Install apt packages needed by utapi and buildbot_worker
@ -19,11 +19,11 @@ RUN wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x6
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
&& apt-get update -qq \
&& cat /tmp/*packages.list | xargs apt-get install -y \
&& pip install pip==9.0.1 \
&& rm -rf /var/lib/apt/lists/* \
&& rm -f /tmp/*packages.list \
&& rm -f /etc/supervisor/conf.d/*.conf \
&& rm -f node-v${NODE_VERSION}-linux-x64.tar.gz
# && pip install pip==9.0.1 \
#
# Install yarn dependencies
@ -39,9 +39,11 @@ RUN yarn cache clean \
#
ARG BUILDBOT_VERSION
RUN pip install buildbot-worker==$BUILDBOT_VERSION
RUN pip3 install requests
RUN pip3 install redis
RUN pip3 install \
buildbot-worker==$BUILDBOT_VERSION \
requests \
redis
ADD eve/workers/unit_and_feature_tests/supervisor/buildbot_worker.conf /etc/supervisor/conf.d/
ADD eve/workers/unit_and_feature_tests/redis/sentinel.conf /etc/sentinel.conf

View File

@ -1,10 +1,10 @@
ca-certificates
git
git-lfs
libffi-dev
libssl-dev
python2.7
python2.7-dev
python-pip
python3-dev
python3-pip
sudo
supervisor
lsof

1
images/warp10/.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
*.jar filter=lfs diff=lfs merge=lfs -text

View File

@ -21,7 +21,7 @@ RUN wget https://github.com/just-containers/s6-overlay/releases/download/v${S6_V
&& rm -rf /tmp/s6-overlay-amd64.tar.gz
# Install protobuf extestion
ADD https://dl.bintray.com/senx/maven/io/warp10/warp10-ext-protobuf/1.1.0-uberjar/warp10-ext-protobuf-1.1.0-uberjar.jar /opt/warp10/lib/
ADD ./images/warp10/warp10-ext-protobuf-1.2.2-uberjar.jar /opt/warp10/lib/
ADD ./images/warp10/s6 /etc
ADD ./warpscript /usr/local/share/warpscript

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:389d2135867c399a389901460c5f2cc09f4857d0c6d08632c2638c25fb150c46
size 15468553