compass install: Bump docker-compose to 1.24.1 91/2091/1 2.0.0-AKRAINO
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 3 Dec 2019 13:49:37 +0000 (14:49 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 3 Dec 2019 13:49:37 +0000 (14:49 +0100)
Since IEC CI jobs run on the same Jenkins static slaves where TA REC
artifact building occurs, installing `docker-compose` and its
requirements (including python-requests) via `sudo pip install` creates
a conflict that breaks TA ISO upload (see upstream bug linked below).

Bump docker-compose to a newer version, which will stop forcefully
downgrading the python-requests package, working around the original
issue.

Upstream-bug: https://jira.linuxfoundation.org/browse/RELENG-2558

Change-Id: I70765213eb97cb29761d0ff41c8918f82a30bbfc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
deploy/compass/deployVM.sh

index 8276ae4..5f6523c 100755 (executable)
@@ -5,6 +5,10 @@ set -x
 build_compass(){
   echo "*** begin Compass4nfv build:"
 
+  # Fix docker-compose -> requests version mismatch with other
+  # Akraino CI jobs (installed requests should be >= 2.12)
+  sed -i "s/\(docker-compose\)==1.14.0/\1==1.24.1/g" deploy/prepare.sh
+
   # Fix bug of getting IP address failure.
   sed -i "s/inet addr:/inet /g" util/docker-compose/roles/compass/tasks/main.yml
   sed -i "s/cut -d: -f2/cut -d ' ' -f10/g" util/docker-compose/roles/compass/tasks/main.yml