Pin repo tool to specific branch

to avoid breaking the CI builds until new baseimages are deployed.

repo changed the minimal git version in its latest update and
now it refuses to work with git versions below 2.10.x .
Until we have new baseimages deployed, pin repo to the 'repo-1' branch.

Bug-AGL: SPEC-3173
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I3272524d94ef78733b109fce6b773aa61df9588f

5 files changed, 6 insertions, 227 deletions

diff --git a/jjb/common/.include-agl-build.sh b/jjb/common/.include-agl-build.sh
deleted file mode 100644
index b1870f2f..00000000
--- a/jjb/common/.include-agl-build.sh
+++ /dev/null
@@ -1,221 +0,0 @@
-#!/bin/bash
-# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de
-# License GPLv2
-#
-# debugging purposes
-set -e
-
-# VARIABLES
-OPTIND=1
-export DLHOST="http://download.automotivelinux.org/"
-export NOGFX=false
-export VERBOSE=false
-export DEBUG=false
-function vprint() {
-    :
-}
-function dprint() {
-    :
-}
-
-# defaults for project, branch, refspec
-export TARGETPROJECT="AGL/AGL-repo"
-export TARGETBRANCH="master"
-export TARGETREFSPEC="refs/heads/master"
-
-export TARGETFEATURESnogfx="agl-appfw-smack agl-netboot agl-sota agl-devel"
-export TARGETFEATURES="agl-demo ${TARGETFEATURESnogfx}"
-
-export TARGETQA=""
-export TARGETIMAGE="agl-demo-platform\${TARGETQA}"
-export TARGETIMAGEnogfx="core-image-minimal"
-
-export TARGETRELEASEVERSION=""
-export TARGETRELEASEBRANCH=""
-
-# apply GERRIT_*
-if test -n "${GERRIT_PROJECT}"; then
-export TARGETPROJECT="${GERRIT_PROJECT}"
-fi
-if test -n "${GERRIT_BRANCH}"; then
-    export TARGETBRANCH="${GERRIT_BRANCH}"
-fi
-if test -n "${GERRIT_REFSPEC}"; then
-export TARGETREFSPEC="${GERRIT_REFSPEC}"
-fi
-
-if test -n "${RELEASE_VERSION}"; then
-export TARGETRELEASEVERSION="${RELEASE_VERSION}"
-fi
-
-if test -n "${RELEASE_BRANCH}"; then
-export TARGETRELEASEBRANCH="${RELEASE_BRANCH}"
-export TARGETBRANCH="${RELEASE_BRANCH}"
-export TARGETREFSPEC="refs/heads/${RELEASE_BRANCH}"
-fi
-
-if test x"" = x"${MACHINE}"; then
-    export MACHINE="qemux86-64"
-fi
-
-# finally cmdline arguments
-while getopts ":b:i:p:r:dnqvx" opt; do
-    case "$opt" in
-	b)
-	    export TARGETBRANCH="$OPTARG"
-	    ;;
-	d)
-	    DEBUG=true
-	    function dprint() {
-		echo "DEBUG: $@"
-	    }
-	    ;;
-	i)
-	    export TARGETIMAGE="$OPTARG"
-	    ;;
-	n)
-	    export NOGFX=true
-	    ;;
-	p)
-	    export TARGETPROJECT="$OPTARG"
-	    ;;
-	q)
-	    export TARGETQA="-qa"
-	    ;;
-	r)
-	    export TARGETREFSPEC="$OPTARG"
-	    ;;
-	v)
-	    VERBOSE=true
-	    function vprint() {
-		echo "VERBOSE: \"$@\""
-	    }
-	    ;;
-	x)
-	    set -x
-	    ;;
-	h|\?)
-	    echo "$0 [-h/-?] -bdinpqrvx"
-	    echo "--------------------------------------------------------------------------------"
-	    echo "  -b <branch>  - name of the branch to use          (default=master)"
-	    echo "  -d           - debug"
-	    echo "  -i <image>   - name of the image to build         (default=agl-demo-platform)"
-	    echo "  -n           - no graphics (no wayland, aka no drivers)"
-	    echo "  -p <project> - project to use                     (default=AGL/AGL-repo)"
-	    echo "  -q           - build '*-qa' images                (default='')"
-	    echo "  -r <refspec> - refspec to use                     (default=refs/heads/master)"
-	    echo "  -v           - verbose"
-	    echo "  -x           - set -x"
-	    echo "--------------------------------------------------------------------------------"
-	    echo "  GERRIT_PROJECT, GERRIT_BRANCH, GERRIT_REFSPEC are used if present,"
-	    echo "  but cmdline arguments take precedence."
-	    echo "--------------------------------------------------------------------------------"
-	    exit 1
-	    ;;
-	:)
-	    echo "Option -$OPTARG required an argument."
-	    exit 1
-	    ;;
-    esac
-done
-
-# expand
-eval TARGETIMAGE="$TARGETIMAGE"
-eval TARGETIMAGEnogfx="$TARGETIMAGEnogfx"
-
-if $NOGFX; then
-    export TARGETIMAGE="${TARGETIMAGEnogfx}"
-    export TARGETFEATURES="${TARGETFEATURESnogfx}"
-fi
-if test x"porter-nogfx" = x"$MACHINE"; then
-    export TARGETIMAGE="${TARGETIMAGEnogfx}"
-    export TARGETFEATURES="${TARGETFEATURESnogfx}"
-fi
-
-if test ! x"" = x"$TARGETRELEASEVERSION"; then
-MANIFESTMOD="-m ${TARGETRELEASEBRANCH}_${TARGETRELEASEVERSION}.xml"
-else
-MANIFESTMOD=""
-fi
-
-if $DEBUG; then
-set | grep ^TARGET || true
-set | grep ^GERRIT || true
-set | grep ^MACHINE || true
-fi
-
-
-# create shared downloads and sstate-cache directory
-mkdir -p downloads
-mkdir -p sstate-cache
-
-# remove old files, we want to test a fresh clone
-export XTMP="$$"
-mv repoclone repoclone$XTMP || true
-( rm -rf repoclone$XTMP & ) || true
-mkdir -p repoclone
-cd repoclone
-
-repo init --reference=/opt/AGL/preclone -q -b $TARGETBRANCH $MANIFESTMOD -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
-
-# next: repo sync and dump manifest
-repo sync --force-sync --detach --no-clone-bundle
-
-# fix up this branch
-MYPROJECT=`echo $TARGETPROJECT | sed -e "s#AGL/##g"`
-
-
-if test -n "${GERRIT_CHANGE_NUMBER}" -a -n "${GERRIT_PATCHSET_NUMBER}"  ; then
-    repo download $MYPROJECT ${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}
-else
-    if test x"AGL-repo" = x"$MYPROJECT" ; then
-	cd .repo/manifests
-        MYREMOTE=`git remote | head -1`
-        git fetch ${MYREMOTE} ${TARGETREFSPEC}
-        git reset --hard FETCH_HEAD
-	cd ../../
-	repo sync --force-sync -d
-    else
-	cd $MYPROJECT
-	MYREMOTE=`git remote | head -1`
-	git fetch ${MYREMOTE} ${TARGETREFSPEC}
-	git reset --hard FETCH_HEAD
-	cd ..
-    fi
-fi
-
-repo manifest -r
-repo manifest -r > ../current_default.xml
-
-# source the env
-source meta-agl/scripts/aglsetup.sh -m ${MACHINE} -b output ${TARGETFEATURES}
-
-# link the shared downloads and sstate-cache
-ln -sf ../../downloads
-ln -sf ../../sstate-cache
-
-echo "" >> conf/local.conf
-
-#limit parallel number of bitbake jobs and parallel jobs in make
-cat << EOF > conf/auto.conf
-PREMIRRORS = "\
-git://.*/.* ${DLHOST}/AGL/mirror/   \n \
-ftp://.*/.* ${DLHOST}/AGL/mirror/   \n \
-http://.*/.* ${DLHOST}/AGL/mirror/  \n \
-https://.*/.* ${DLHOST}/AGL/mirror/ \n \
-             "
-
-SSTATE_MIRRORS = "\
-file://.* file:///opt/AGL/sstate-mirror/\${MACHINE}/PATH    \n \
-file://.* ${DLHOST}/sstate-mirror/\${MACHINE}/PATH \n \
-                 "
-
-SSTATE_DIR = "\${TOPDIR}/sstate-cache/${GERRIT_BRANCH}/\${DEFAULTTUNE}/"
-EOF
-
-cat conf/auto.conf
-
-# finally, build the agl-demo-platform
-bitbake $TARGETIMAGE
-
-du -hs tmp/deploy/*
diff --git a/jjb/common/include-agl-repo.sh b/jjb/common/include-agl-repo.sh
index c2bdf930..648e01e8 100644
--- a/jjb/common/include-agl-repo.sh
+++ b/jjb/common/include-agl-repo.sh
@@ -19,12 +19,12 @@ cd repoclone
 export REPODIR=`pwd`
 
 if test x"" = x"${RELEASE_VERSION}" -a x"" = x"${RELEASE_BRANCH}" ; then
-    repo init --reference=/opt/AGL/preclone -q -b $TARGETBRANCH -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
+    repo init --repo-branch=repo-1 --reference=/opt/AGL/preclone -q -b $TARGETBRANCH -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
 else
   if test x"AGL/meta-renesas-rcar-gen3" = x"${TARGETPROJECT}" ; then
-    repo init --reference=/opt/AGL/preclone -q -b master -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
+    repo init --repo-branch=repo-1 --reference=/opt/AGL/preclone -q -b master -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
   else
-  repo init --reference=/opt/AGL/preclone -q -b $TARGETBRANCH -m ${RELEASE_BRANCH}_${RELEASE_VERSION}.xml -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
+  repo init --repo-branch=repo-1 --reference=/opt/AGL/preclone -q -b $TARGETBRANCH -m ${RELEASE_BRANCH}_${RELEASE_VERSION}.xml -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
   fi
 fi
 
diff --git a/jjb/common/include-apps-build-app-by-recipe.sh b/jjb/common/include-apps-build-app-by-recipe.sh
index c3d9ea23..628e092c 100644
--- a/jjb/common/include-apps-build-app-by-recipe.sh
+++ b/jjb/common/include-apps-build-app-by-recipe.sh
@@ -81,7 +81,7 @@ if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "apps/"); t
 
     mkdir AGL
     pushd AGL
-    repo init --reference=/opt/AGL/preclone -q -b $TARGETBRANCH -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
+    repo init  --repo-branch=repo-1 --reference=/opt/AGL/preclone -q -b $TARGETBRANCH -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
     repo sync --force-sync -d -j12
     
     source meta-agl/scripts/aglsetup.sh -m qemux86-64 agl-demo agl-devel agl-voiceagent-alexa agl-cluster-demo 
diff --git a/jjb/pre-fetch/include-prefetch.sh b/jjb/pre-fetch/include-prefetch.sh
index bf47c0a7..ddaf40ea 100644
--- a/jjb/pre-fetch/include-prefetch.sh
+++ b/jjb/pre-fetch/include-prefetch.sh
@@ -22,7 +22,7 @@ rm -rf repoclone2 || true
 mkdir -p repoclone
 cd repoclone
 
-repo init --reference=/opt/AGL/preclone -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo.git
+repo init --repo-branch=repo-1 --reference=/opt/AGL/preclone -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo.git
 repo sync -j8
 
 for i in $BOARDS ; do
diff --git a/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh b/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
index ef267a6d..c8219e69 100644
--- a/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
+++ b/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
@@ -156,7 +156,7 @@ mv repoclone repoclone$XTMP || true
 mkdir -p repoclone
 cd repoclone
 
-repo init --reference=/opt/AGL/preclone -q -b $TARGETBRANCH $MANIFESTMOD -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
+repo init  --repo-branch=repo-1 --reference=/opt/AGL/preclone -q -b $TARGETBRANCH $MANIFESTMOD -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
 
 # next: repo sync and dump manifest
 repo sync --force-sync --detach --no-clone-bundle