aboutsummaryrefslogtreecommitdiff
path: root/linaro-art
diff options
context:
space:
mode:
authorJulien Duraj <julien.duraj@linaro.org>2019-08-01 14:11:14 +0100
committerJulien Duraj <julien.duraj@linaro.org>2019-08-01 14:23:38 +0100
commitce5092a2e2b9748cf26b38ed9ab9efb91bd025e1 (patch)
tree9e73b88b23bc25f4e412877602c2cfc626fc8cde /linaro-art
parent57cfd5aedcc7e5c665d01465b6c56e33de8de0fd (diff)
ART Build: rework the job using existing scripts
The new short manifest config in android-build-configs is used. Additionally, have the option of checking out a specific revision of the ART build scripts. Change-Id: I36449d757ae78b0924ffec2965942a4940b8ab56
Diffstat (limited to 'linaro-art')
-rw-r--r--linaro-art/build/builders.sh40
1 files changed, 11 insertions, 29 deletions
diff --git a/linaro-art/build/builders.sh b/linaro-art/build/builders.sh
index 91b6318e..5c83a4a6 100644
--- a/linaro-art/build/builders.sh
+++ b/linaro-art/build/builders.sh
@@ -1,41 +1,23 @@
#!/bin/bash -xe
-sudo apt-get update
-sudo apt-get install -y python-requests
-
# Build scripts
ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
-
mkdir -p "${ANDROID_BUILD_DIR}"
-cd "${ANDROID_BUILD_DIR}"
-
-git config --global user.email "linaro-art-ci@linaro.org"
-git config --global user.name "Linaro ART CI"
-
-rm -f "${WORKSPACE}/"*.{txt,log,csv}
-# Use the `master-art` short manifest for ART only dependencies.
-repo init --depth=1 \
- -u https://android.googlesource.com/platform/manifest \
- -b master-art
+ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
+git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
+git -C ${ART_BUILD_SCRIPTS_DIR} fetch --tags --progress origin ${ART_BUILD_SCRIPTS_REFSPEC}
+git -C ${ART_BUILD_SCRIPTS_DIR} checkout ${ART_BUILD_SCRIPTS_REF}
-( rm -rf .repo/local_manifests && \
- git clone ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git -b master-art \
- .repo/local_manifests )
+cd ${ART_BUILD_SCRIPTS_DIR}/jenkins
+./setup_host.sh
+./setup_android.sh
-repo sync -j10 --current-branch --force-sync --detach --force-remove-dirty
+./test_launcher.pl ./build_target.sh --target arm_krait-eng
+./test_launcher.pl ./build_target.sh --target armv8-eng
-# build_target.sh & --skip-build on target_test.sh
-repo download -c "linaro-art/art-build-scripts" 20281/23
-
-if [[ -v GERRIT_CHANGE_NUMBER ]]; then
- repo download "$GERRIT_PROJECT" "$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER"
-fi
-
-repo manifest -r -o "${WORKSPACE}/pinned-manifest.xml"
-
-scripts/jenkins/test_launcher.pl scripts/jenkins/build_target.sh --target arm_krait-eng
-scripts/jenkins/test_launcher.pl scripts/jenkins/build_target.sh --target armv8-eng
+sudo apt-get update
+sudo apt-get install -y python-requests
mkdir -p pub
mv *.tar.xz pub/