aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNuoHan Qiao <qiaonuohan@cn.fujitsu.com>2016-01-26 21:51:25 -0500
committerNuoHan Qiao <qiaonuohan@cn.fujitsu.com>2016-01-28 20:51:20 -0500
commitbedf8425836f5abd46a8cbf2a905af8fb833c8b4 (patch)
tree857c41c95748d5e42f1f6ce38c6a25c20ba6d4ec
parent5ec09eeb0332456caf6a045bd99cb1d90211e1af (diff)
Fix CIAT.build_deploy
This patch is for testing. If you want to use this, please follow the following steps: 1. Prepare a repo under /compile/agl-demo/CIAT.bak/, then this repo will be copied to build space 2. Prepare proxychains. It will help to cross GFW 3. uncomment "export SPEEDUP_TEST=yes" and "export PROXY_FOR_REPO=/usr/bin/proxychains" Beware PROXY_FOR_REPO should be the path of proxychains Change-Id: Ie31d627a72a2707680b03ea1923e5cb59c24a7d0 Signed-off-by: NuoHan Qiao <qiaonuohan@cn.fujitsu.com>
-rw-r--r--jta-core/engine/tests/CIAT.build_deploy/agl_build.sh6
-rw-r--r--jta-core/engine/tests/CIAT.build_deploy/build_deploy.sh3
2 files changed, 5 insertions, 4 deletions
diff --git a/jta-core/engine/tests/CIAT.build_deploy/agl_build.sh b/jta-core/engine/tests/CIAT.build_deploy/agl_build.sh
index fd112b0..7c773b9 100644
--- a/jta-core/engine/tests/CIAT.build_deploy/agl_build.sh
+++ b/jta-core/engine/tests/CIAT.build_deploy/agl_build.sh
@@ -23,7 +23,7 @@ if test -f ~/bin/repo; then
echo "INFO: ~/bin/repo is ready" > agl_build.log
else
mkdir -p ~/bin
- curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
+ $PROXY_FOR_REPO curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
fi
chmod a+x ~/bin/repo
@@ -52,7 +52,7 @@ if test x"" != x"$GERRIT_BRANCH"; then
export REPOCLONE="$GERRIT_BRANCH"
fi
- repo init -q -b $REPOCLONE -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
+ $PROXY_FOR_REPO repo init -q -b $REPOCLONE -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
else
echo ""
echo "####################################################"
@@ -60,7 +60,7 @@ else
echo "####################################################"
echo ""
- repo init -q -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
+ $PROXY_FOR_REPO repo init -q -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
fi
# this is for testing, a copy of repoclone should be placed under /compile/agl-demo/CIAT.bak/,
diff --git a/jta-core/engine/tests/CIAT.build_deploy/build_deploy.sh b/jta-core/engine/tests/CIAT.build_deploy/build_deploy.sh
index 5a48ce2..903363e 100644
--- a/jta-core/engine/tests/CIAT.build_deploy/build_deploy.sh
+++ b/jta-core/engine/tests/CIAT.build_deploy/build_deploy.sh
@@ -19,7 +19,8 @@ function build_image {
sshpass -p "$BUILD_PASSWORD" $SERVER_SSH "$BUILD_USER"@"$BUILD_SERVERIP" \
"cd $BUILD_PATH; \
- export SPEEDUP_TEST=no; \
+ #export SPEEDUP_TEST=yes; \
+ #export PROXY_FOR_REPO=/usr/bin/proxychains; \
export GERRIT_PROJECT=$GERRIT_PROJECT; \
export GERRIT_BRANCH=$GERRIT_BRANCH; \
export GERRIT_REFSPEC=$GERRIT_REFSPEC; \