diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-07-05 18:19:59 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-07-05 18:19:59 +0200 |
| commit | 439be3a8a0d91d5158f03a469d90328d9907dc43 (patch) | |
| tree | d5f869ab4d87381e213155d70179fe8c1ab5af72 /jjb | |
| parent | 609e10e146a85085b80ae16872b97c79790e6f0b (diff) | |
Rework xds build
Change-Id: I18830298ef2d8fe4d65b588735ed1662042505ce
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/ci-xds-verify/ci-xds-local.sh | 19 | ||||
| -rw-r--r-- | jjb/common/include-xds-build-common.sh | 3 | ||||
| -rw-r--r-- | jjb/common/include-xds-prepare-upload-folder.sh | 7 |
3 files changed, 10 insertions, 19 deletions
diff --git a/jjb/ci-xds-verify/ci-xds-local.sh b/jjb/ci-xds-verify/ci-xds-local.sh index e902d957..7e70838b 100755 --- a/jjb/ci-xds-verify/ci-xds-local.sh +++ b/jjb/ci-xds-verify/ci-xds-local.sh @@ -2,22 +2,21 @@ #set -x export AGLBRANCH=master -export GERRIT_REFSPEC="refs/changes/51/9551/2" export GERRIT_PROJECT="src/xds/xds-server" -export GERRIT_CHANGE_NUMBER="10799" -export GERRIT_PATCHSET_NUMBER="1" -export GERRIT_PATCHSET_REVISION="1a1ff962da92aff5a1d3e757710c725e03238458" +export PROJECT_TO_BUILD="xds-server" + +#export GERRIT_REFSPEC="refs/changes/99/10799/1" +#export GERRIT_CHANGE_NUMBER="10799" +#export GERRIT_PATCHSET_NUMBER="1" +#export GERRIT_PATCHSET_REVISION="1a1ff962da92aff5a1d3e757710c725e03238458" export GERRIT_HOST="gerrit.automotivelinux.org" export GERRIT_PORT="29418" -export PROJECT_TO_BUILD="xds-server" export -p > env.save -# TBI -source env.save +. ../common/include-xds-header.sh +. ../common/include-xds-build-common.sh -#. ../common/include-xds-header.sh -#. ../common/include-xds-build-common.sh -done
\ No newline at end of file +source env.save diff --git a/jjb/common/include-xds-build-common.sh b/jjb/common/include-xds-build-common.sh index fbbbf1e9..2ddd4967 100644 --- a/jjb/common/include-xds-build-common.sh +++ b/jjb/common/include-xds-build-common.sh @@ -14,5 +14,4 @@ export V=1 make package-all cd $ROOTDIR -tree - +tree -I "vendor|node_modules" || true diff --git a/jjb/common/include-xds-prepare-upload-folder.sh b/jjb/common/include-xds-prepare-upload-folder.sh index e28e462a..1e729b02 100644 --- a/jjb/common/include-xds-prepare-upload-folder.sh +++ b/jjb/common/include-xds-prepare-upload-folder.sh @@ -15,15 +15,8 @@ rm -rf UPLOAD/${AGLBRANCH} || true mkdir -p UPLOAD/${AGLBRANCH}/ export DEST=$(pwd)/UPLOAD/${AGLBRANCH}/ -pushd ${MYPROJECT} -pwd - ls -alh -ls - -ls package || true - cp src/gerrit.automotivelinux.org/gerrit/${GERRIT_PROJECT}/*.zip $DEST ls -alh $DEST |