Merge branch 'integration' into 'master'

Apt-get fix

See merge request FLAME/consortium/3rdparties/flame-clmc!54

.gitlab-ci.yml

@@ -35,8 +35,8 @@ build:tests:
     - python setup.py sdist --dist-dir=$CI_PROJECT_DIR/build
   artifacts:
     paths:
-    - build/clmctest-1.4.0.tar.gz
-    - build/clmcservice-1.4.0.tar.gz
+    - build/clmctest-2.0.0.tar.gz
+    - build/clmcservice-2.0.0.tar.gz
     expire_in: 1 day
 
 test:all:
@@ -50,10 +50,10 @@ test:all:
     - echo "REPO_PASS=${REPO_PASS}" >> $CI_PROJECT_DIR/reporc
     - sudo scripts/test/fixture.sh create -f src/test/clmctest/rspec.json -r $CI_PROJECT_DIR -c all
     - sudo mkdir /var/lib/lxd/containers/test-runner/rootfs/opt/clmc/build
-    - sudo cp build/clmctest-1.4.0.tar.gz /var/lib/lxd/containers/test-runner/rootfs/opt/clmc/build
-    - sudo cp build/clmcservice-1.4.0.tar.gz /var/lib/lxd/containers/test-runner/rootfs/opt/clmc/build
-    - sudo lxc exec test-runner -- pip3 install /opt/clmc/build/clmctest-1.4.0.tar.gz
-    - sudo lxc exec test-runner -- pip3 install /opt/clmc/build/clmcservice-1.4.0.tar.gz
+    - sudo cp build/clmctest-2.0.0.tar.gz /var/lib/lxd/containers/test-runner/rootfs/opt/clmc/build
+    - sudo cp build/clmcservice-2.0.0.tar.gz /var/lib/lxd/containers/test-runner/rootfs/opt/clmc/build
+    - sudo lxc exec test-runner -- pip3 install /opt/clmc/build/clmctest-2.0.0.tar.gz
+    - sudo lxc exec test-runner -- pip3 install /opt/clmc/build/clmcservice-2.0.0.tar.gz
     - sudo lxc exec test-runner -- pytest -s --tb=short -rfp --pyargs clmctest
   when: on_success      
   

scripts/clmc-agent/install.sh

@@ -27,7 +27,7 @@
 # Force fail on command fail
 set -euo pipefail
 
-apt-get update
+apt-get update -o Acquire::CompressionTypes::Order::=gz
 apt-get install wget -y
 
 echo "Installing Telegraf agent"

scripts/clmc-service/install-clmc-service.sh

@@ -23,7 +23,7 @@
 #//      Created for Project :   FLAME
 #//
 #/////////////////////////////////////////////////////////////////////////
-apt-get update
+apt-get update -o Acquire::CompressionTypes::Order::=gz
 apt-get install libssl-dev -y
 
 # Create the database for the WHOAMI API

scripts/clmc-service/install-neo4j.sh

@@ -41,7 +41,7 @@
 # http 7474 including the browser on localhost:7474
 # https 7473
 
-sudo apt update
+sudo apt update -o Acquire::CompressionTypes::Order::=gz
 sudo apt install wget openjdk-8-jdk -y
 
 # configure apt

scripts/clmc-service/install-tick-stack.sh

@@ -35,7 +35,7 @@ KAPACITOR_CHECKSUM=eea9b215f241906570eafe3857e1d4c5
 CHRONOGRAF_VERSION=1.4.4.2
 CHRONOGRAF_CHECKSUM=eea6915aa6db8f134fcd3b095e863b773bfb3a16a26e346dd65904a07df97963
 
-apt-get update
+apt-get update -o Acquire::CompressionTypes::Order::=gz
 echo "----> Installing wget"
 apt-get install -y wget
 

src/service/VERSION

-__version__ = "1.4.0"
\ No newline at end of file
+__version__ = "2.0.0"
\ No newline at end of file

src/test/VERSION

-__version__ = "1.4.0"
\ No newline at end of file
+__version__ = "2.0.0"
\ No newline at end of file

src/test/clmctest/services/apache/install.sh

@@ -25,7 +25,7 @@
 #/////////////////////////////////////////////////////////////////////////
 
 # Install apache
-sudo apt-get update
+sudo apt-get update -o Acquire::CompressionTypes::Order::=gz
 sudo apt-get -y install apache2
 
 # start apache

src/test/clmctest/services/ffmpeg/install.sh

@@ -20,7 +20,7 @@
 ##      Created Date :          09-02-2018
 ##      Created for Project :   FLAME
 
-apt-get update
+apt-get update -o Acquire::CompressionTypes::Order::=gz
 apt-get -y install zip python
 
 wget http://zebulon.bok.net/Bento4/binaries/Bento4-SDK-1-5-1-621.x86_64-unknown-linux.zip

src/test/clmctest/services/minio/install.sh

@@ -25,7 +25,7 @@
 #/////////////////////////////////////////////////////////////////////////
 
 # Prerequisites
-sudo apt-get update
+sudo apt-get update -o Acquire::CompressionTypes::Order::=gz
 sudo apt-get install -y wget git
 
 # Environment variables for this process

src/test/clmctest/services/mongo/install.sh

@@ -25,7 +25,7 @@
 #/////////////////////////////////////////////////////////////////////////
 
 # Install apache
-apt-get update
+apt-get update -o Acquire::CompressionTypes::Order::=gz
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
 echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.6.list
 apt-get update

src/test/clmctest/services/pytest/install.sh

@@ -23,7 +23,7 @@
 #//      Created for Project :   FLAME
 #//
 #/////////////////////////////////////////////////////////////////////////
-apt-get update
+apt-get update -o Acquire::CompressionTypes::Order::=gz
 apt-get -y install python3 python3-pip python-influxdb  
 update-alternatives --install /usr/bin/python python /usr/bin/python3 10