From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 5 Dec 2019 09:28:34 +0000 (+0100)
Subject: iec: compass: Bump docker-compose to 1.24.1
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F93%2F2093%2F1;p=ci-management.git

iec: compass: Bump docker-compose to 1.24.1

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: Ic449f3d43c5df45846b7008db50efcbcd339c3f9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/jjb/iec/iec-compass-deploy.sh b/jjb/iec/iec-compass-deploy.sh
index 8cdb65e..9db4c0b 100755
--- a/jjb/iec/iec-compass-deploy.sh
+++ b/jjb/iec/iec-compass-deploy.sh
@@ -30,6 +30,10 @@ modify_workdir(){
   ln -sfn $(pwd)/work $COMPASS_WORK_DIR
 
   sed -i "s#\$COMPASS_DIR/work#$COMPASS_WORK_DIR#g" deploy/launch.sh
+
+  # 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
 }
 
 config_vm