eve/main.yml

@@ -27,30 +27,13 @@ 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:
@@ -66,7 +49,6 @@ stages:
     worker: *workspace
     steps:
       - Git: *clone
-      - ShellCommand: *fetch_lfs
       - ShellCommand:
           name: run static analysis tools on markdown
           command: yarn run lint_md
@@ -84,7 +66,6 @@ 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
@@ -96,7 +77,6 @@ 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
@@ -108,7 +88,6 @@ 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
@@ -120,7 +99,6 @@ 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
@@ -135,7 +113,6 @@ stages:
         vault: enabled
     steps:
       - Git: *clone
-      - ShellCommand: *fetch_lfs
       - ShellCommand:
           name: Wait for Warp 10
           command: |
@@ -166,7 +143,6 @@ stages:
         vault: enabled
     steps:
       - Git: *clone
-      - ShellCommand: *fetch_lfs
       - ShellCommand:
           name: Wait for Warp 10
           command: |

eve/workers/unit_and_feature_tests/Dockerfile

@@ -1,4 +1,4 @@
-FROM buildpack-deps:focal-curl
+FROM buildpack-deps:jessie-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,11 +39,9 @@ RUN yarn cache clean \
 #
 ARG BUILDBOT_VERSION
 
-RUN pip3 install \
+RUN pip install buildbot-worker==$BUILDBOT_VERSION
-    buildbot-worker==$BUILDBOT_VERSION \
+RUN pip3 install requests
-    requests \
+RUN pip3 install redis
-    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
 

eve/workers/unit_and_feature_tests/buildbot_worker_packages.list

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

images/warp10/.gitattributes

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

images/warp10/Dockerfile

@@ -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 ./images/warp10/warp10-ext-protobuf-1.2.2-uberjar.jar /opt/warp10/lib/
+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/s6 /etc
 ADD ./warpscript /usr/local/share/warpscript

images/warp10/warp10-ext-protobuf-1.2.2-uberjar.jar

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