X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fiec%2Fiec-compass-deploy.sh;h=443c115404e899de27b170be8cc9a6efb1612f54;hp=8cdb65e24f88e0e8f47cb3ac7bbbb3a10d7e526f;hb=HEAD;hpb=9cbd6797b0330e2461678a2d9592c2c235204993 diff --git a/jjb/iec/iec-compass-deploy.sh b/jjb/iec/iec-compass-deploy.sh index 8cdb65e..443c115 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 @@ -42,4 +46,6 @@ echo "Compass Deploy successful" rm -rf "$COMPASS_WORK_DIR" rm -rf work +# Fix permissions so we can archive log files before pushing to Nexus +sudo chown $(id -u):$(id -g) -R "${WORKSPACE}" exit 0