Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Chore: Update global-jjb to v0.65.2
[ci-management.git]
/
jjb
/
iec
/
iec-compass-deploy.sh
diff --git
a/jjb/iec/iec-compass-deploy.sh
b/jjb/iec/iec-compass-deploy.sh
index
8cdb65e
..
443c115
100755
(executable)
--- 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
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
}
config_vm
@@
-42,4
+46,6
@@
echo "Compass Deploy successful"
rm -rf "$COMPASS_WORK_DIR"
rm -rf work
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
exit 0