Merge branch 'rel_2_dev' of github.com:/assimilation/assimilation-off…

…icial into rel_2_dev

.travis.yml

@@ -1,54 +1,28 @@
 language: minimal
 
-env:
-  global:
-    - VERSION=2.0.0
-
-stages:
-  - name: lint
-    if: branch = remove_to_enable
-  - name: tests
-    if: branch = remove_to_enable
-  - name: "create packages"
-  - name: "test packages"
+script:
+  - echo $TRAVIS_DIST
+  - echo $TRAVIS_OS_NAME
+  - echo $TRAVIS_CPU_ARCH
+  - uname -a
+  - cd /tmp
+  - wget --quiet https://github.com/borgified/assimilation-official/releases/download/test/nanoprobe
+  - echo "4be5fa9116cdf08a0eff3a60585af1832230df213f5fe734ea6f3c6ce8001640  nanoprobe" > nanoprobe.sha256sum
+  - sha256sum -c nanoprobe.sha256sum
+  - chmod +x nanoprobe
+  - ./nanoprobe
 
 jobs:
   include:
-
-    - stage: lint
-      name: lint
-      script:
-        - echo "run some linter"
-
-    - stage: tests
-      name: tests
-      after_success:
-        - echo "do some tests"
-
-    - stage: "create packages"
-      name: "create packages"
-      after_success:
-        - docker build --build-arg VERSION -f $TRAVIS_BUILD_DIR/ci/Dockerfiles/ubuntu1804_fpm.dockerfile -t ubuntu_fpm /tmp/dummy/
-        - docker build --build-arg VERSION -f $TRAVIS_BUILD_DIR/ci/Dockerfiles/centos7_fpm.dockerfile -t centos_fpm /tmp/dummy/
-        - docker run -v /tmp/output:/output ubuntu_fpm bash -c "cp /workdir/*.deb /output"
-        - docker run -v /tmp/output:/output centos_fpm bash -c "cp /workdir/*.rpm /output"
-        - ls -al /tmp/output/*.deb /tmp/output/*.rpm
-        - echo "upload packages to bintray"
-        - curl -T /tmp/output/nanoprobe-${VERSION}-1.x86_64.rpm -u$BINTRAY_USER:$BINTRAY_PASS https://api.bintray.com/content/assimilation/rpm/nanoprobe/$VERSION/nanoprobe-${VERSION}-1.x86_64.rpm
-        - curl -T /tmp/output/nanoprobe_${VERSION}_amd64.deb -u$BINTRAY_USER:$BINTRAY_PASS "https://api.bintray.com/content/assimilation/deb/nanoprobe/$VERSION/nanoprobe_${VERSION}_amd64.deb;deb_distribution=bionic;deb_component=universe;deb_architecture=amd64"
-
-    - stage: "test packages"
-      name: "test packages"
-      script:
-        - echo "download packages"
-        - echo "test them out"
-        - docker run centos bash -c "yum -y install wget && wget https://bintray.com/assimilation/rpm/rpm -O /etc/yum.repos.d/bintray-assimilation-rpm.repo && yum -y install nanoprobe && rpm -qa nanoprobe && yum -y remove nanoprobe"
-        - docker run ubuntu bash -c "apt-get -y update && apt-get -y install ca-certificates gnupg && echo 'deb https://dl.bintray.com/assimilation/deb bionic universe' > /etc/apt/sources.list.d/bintray_assimilation.list && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 379CE192D401AB61 && apt-get -y update && apt-get -y install nanoprobe && dpkg -l nanoprobe && apt-get -y remove nanoprobe"
-
-script:
-  - echo "build binaries"
-  - cd $TRAVIS_BUILD_DIR/docker/rel2
-  - ./dockit
-    # create dummy nanoprobe binary
-  - mkdir /tmp/dummy
-  - docker run -v /tmp/dummy:/copyout assimilationproject/nanoprobe:2.0.0 bash -c "cp nanoprobe /copyout"
+    - stage: test on different distributions
+      name: ubuntu 12.04
+      dist: precise
+    - stage: test on different distributions
+      name: ubuntu 14.04
+      dist: trusty
+    - stage: test on different distributions
+      name: ubuntu 16.04
+      dist: xenial
+    - stage: test on different distributions
+      name: ubuntu 18.04
+      dist: bionic

Dependencies.md

@@ -99,6 +99,6 @@ The version and edition of Neo4j that we use is found in
   - [```docker/meson/toolrequirements.txt```](https://github.com/assimilation/assimilation-official/blob/rel_2_dev/docker/meson/toolrequirements.txt): Controls the version of Meson and Ninja used to build the nanoprobe.
   - [```docker/nanoprobe/dockerfile.in```](https://github.com/assimilation/assimilation-official/blob/rel_2_dev/docker/nanoprobe/dockerfile.in): Controls the version of libsodium and libpcap that the nanoprobe uses.
   - [```cma/min-requirements.txt```](https://github.com/assimilation/assimilation-official/blob/rel_2_dev/cma/min-requirements.txt): Specifies direct dependencies of Python packages used by the CMA (with minimal version constraints).
-  - [```cma/requirements.txt```](https://github.com/assimilation/assimilation-official/blob/rel_2_dev/cma/requirement.txt): Fully specified set of all packages used by the CMA directly and indirectly.
+  - [```cma/requirements.txt```](https://github.com/assimilation/assimilation-official/blob/rel_2_dev/cma/requirements.txt): Fully specified set of all packages used by the CMA directly and indirectly.
   Built from min-requirements.txt.
   - [```cma/cmainit.py```](https://github.com/assimilation/assimilation-official/blob/rel_2_dev/cma/cmainit.py): controls the version and edition of Neo4j that we use at runtime.