do not rely on build-info from manifest and use pip3

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I4c123670330e45e42036a621c5b82c34deffbc20

7 files changed, 36 insertions, 26 deletions

diff --git a/jjb/common/OLD/include-agl-app-run-test-short.sh b/jjb/common/OLD/include-agl-app-run-test-short.sh
index e1bd6998..e21e68c1 100644
--- a/jjb/common/OLD/include-agl-app-run-test-short.sh
+++ b/jjb/common/OLD/include-agl-app-run-test-short.sh
@@ -6,7 +6,8 @@
 ## Run SHORT CI test
 ################################################################################
 
-#set -x
+#
+set -x
 
 cd $REPODIR
 
@@ -16,7 +17,7 @@ BUILD_VERSION="AGL-app-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER"
 echo "# LAVA lab target: ${LAVA_LAB} #"
 # releng-scripts depends on jinja2 >= 2.9
 echo "## Check version of python-jinja2: "
-pip show jinja2
+pip3 show jinja2
 CREATE_ARGS=""
 case $TARGETARCH in
 arm)
diff --git a/jjb/common/include-agl-kci-publish-build-meta.sh b/jjb/common/include-agl-kci-publish-build-meta.sh
index 1c586a45..5782c004 100644
--- a/jjb/common/include-agl-kci-publish-build-meta.sh
+++ b/jjb/common/include-agl-kci-publish-build-meta.sh
@@ -5,13 +5,15 @@ echo "#########################################"
 echo "\n\n\n"
 
 kci-publish() {
-	if [ -e tmp/deploy/images/${TARGETMACHINE}/build-info ] ; then
-		echo "DEBUG: load build-info"
-		# we need some variable from here
-		source tmp/deploy/images/${TARGETMACHINE}/build-info
-	fi
+#	if [ -e tmp/deploy/images/${TARGETMACHINE}/build-info ] ; then
+#		echo "DEBUG: load build-info"
+#		# we need some variable from here
+#		source tmp/deploy/images/${TARGETMACHINE}/build-info
+#	fi
 	echo "DEBUG: GERRIT_PROJECT $GERRIT_PROJECT"
 
+set
+
 	FSR=""
 	# check GERRIT_PROJECT to find if we build an app or not
 	if echo $GERRIT_PROJECT |grep -q apps ;then
@@ -108,4 +110,4 @@ set -e
 	return 0
 }
 
-kci-publish
+#kci-publish
diff --git a/jjb/common/include-agl-run-test-rsync-changeid.sh b/jjb/common/include-agl-run-test-rsync-changeid.sh
index 2568992f..8450e649 100644
--- a/jjb/common/include-agl-run-test-rsync-changeid.sh
+++ b/jjb/common/include-agl-run-test-rsync-changeid.sh
@@ -33,9 +33,11 @@ do
 	echo "tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB}"
 	echo "tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-}"
 
-	if [ -e tmp/deploy/images/${TARGETMACHINE}/build-info ] ; then
-		cp -avL tmp/deploy/images/${TARGETMACHINE}/build-info ${DEST}/
-	fi
+#	if [ -e tmp/deploy/images/${TARGETMACHINE}/build-info ] ; then
+#		cp -avL tmp/deploy/images/${TARGETMACHINE}/build-info ${DEST}/
+#	fi
+
+set
 
 	# detect BUG SPEC-3751
 	F_NBDROOT="tmp/deploy/images/${TARGETMACHINE}/$DEVICE_NBDROOT"
diff --git a/jjb/common/include-agl-run-test-short-release.sh b/jjb/common/include-agl-run-test-short-release.sh
index 7b13784e..5c5a9c0d 100644
--- a/jjb/common/include-agl-run-test-short-release.sh
+++ b/jjb/common/include-agl-run-test-short-release.sh
@@ -15,7 +15,8 @@ BUILD_VERSION="AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION"
 echo "# LAVA lab target: ${LAVA_LAB} #"
 # releng-scripts depends on jinja2 >= 2.9
 echo "## Check version of python-jinja2: "
-pip show jinja2
+pip3 show jinja2
+
 CREATE_ARGS=""
 CREATE_ARGS+="--machine ${releng_device} "
 CREATE_ARGS+="--build-type release "
diff --git a/jjb/common/include-agl-run-test-short-releaseit.sh b/jjb/common/include-agl-run-test-short-releaseit.sh
index 91f0a57f..1c494eca 100644
--- a/jjb/common/include-agl-run-test-short-releaseit.sh
+++ b/jjb/common/include-agl-run-test-short-releaseit.sh
@@ -12,16 +12,19 @@ UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/de
 
 cd $REPODIR
 
-wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info"
-if [ -e build-info ]; then
-	cat build-info
-	source build-info
-fi
+#wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info"
+#if [ -e build-info ]; then
+#	cat build-info
+#	source build-info
+#fi
+
+set
 
 echo "# LAVA lab target: ${LAVA_LAB} #"
 # releng-scripts depends on jinja2 >= 2.9
 echo "## Check version of python-jinja2: "
-pip show jinja2
+pip3 show jinja2
+
 CREATE_ARGS=""
 CREATE_ARGS+="--machine ${releng_device} "
 CREATE_ARGS+="--build-type release "
diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh
index 0e16e055..3fafcae6 100644
--- a/jjb/common/include-agl-run-test-short.sh
+++ b/jjb/common/include-agl-run-test-short.sh
@@ -12,11 +12,11 @@ UPLOAD_URL=${UPLOAD_URL_BASE}/${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}/
 
 cd $REPODIR
 
-wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info"
-if [ -e build-info ]; then
-	cat build-info
-	source build-info
-fi
+#wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info"
+#if [ -e build-info ]; then
+#	cat build-info
+#	source build-info
+#fi
 
 BUILD_VERSION=""
 if [[ ! -z $DIST_BUILD_TOPIC ]]; then
@@ -28,7 +28,8 @@ fi
 echo "# LAVA lab target: ${LAVA_LAB} #"
 # releng-scripts depends on jinja2 >= 2.9
 echo "## Check version of python-jinja2: "
-pip show jinja2
+pip3 show jinja2
+
 CREATE_ARGS=""
 CREATE_ARGS+="--machine ${releng_device} "
 CREATE_ARGS+="--build-type ci "
diff --git a/jjb/common/include-agl-send-email-report.sh b/jjb/common/include-agl-send-email-report.sh
index f94a0c07..a9d10c2f 100644
--- a/jjb/common/include-agl-send-email-report.sh
+++ b/jjb/common/include-agl-send-email-report.sh
@@ -14,7 +14,7 @@ set | grep MACH
 
 send_email_report()
 {
-wget -q ${UPLOAD_URL}/build-info || echo "ERROR: send_email_report: failed to get build-info"
+#wget -q ${UPLOAD_URL}/build-info || echo "ERROR: send_email_report: failed to get build-info"
 
 if [ ! -s build-info ]; then
 	return 0
@@ -37,4 +37,4 @@ if [ -n "$KCI_EMAIL_AUTH_TOKEN" ]; then
 fi
 }
 
-send_email_report
+#send_email_report