Get atf-pkg.sh working on Jenkins

The atf.sh script was generating the wrong tarball filename and the
atf-pkg.sh script was making various mistakes around the job name.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

2 files changed, 5 insertions, 4 deletions

diff --git a/atf-pkg.sh b/atf-pkg.sh
index bd4a9cb..ac0bcfc 100755
--- a/atf-pkg.sh
+++ b/atf-pkg.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 
-JOB_NAME=linaro
 repo=arm-trusted-firmware
+export BUILD_NUMBER=${BUILD_NUMBER:-0}
+export JOB_NAME=${JOB_NAME:-arm-trusted-firmware}
 
 set -e
 
-pkg_source=arm-trusted-firmware-${JOBNAME}
+pkg_source=arm-trusted-firmware
 pkg_repository=git://git.linaro.org/arm/models/arm-trusted-firmware.git
 
 packaging_dir=${repo}-ci/debian
diff --git a/atf.sh b/atf.sh
index 486921d..df4f3a0 100755
--- a/atf.sh
+++ b/atf.sh
@@ -19,7 +19,7 @@ if [ -z "${WORKSPACE}" ]; then
   # Local build
   export WORKSPACE=`pwd`
   export BUILD_NUMBER=0
-  export JOB_NAME=${JOB_NAME:-linaro}
+  export JOB_NAME=${JOB_NAME:-arm-trusted-firmware}
 fi
 
 case "${JOB_NAME}" in
@@ -44,7 +44,7 @@ case "${JOB_NAME}" in
 	;;
 esac
 
-pkg_source=arm-trusted-firmware-${JOB_NAME}
+pkg_source=${JOB_NAME}
 pkg_repository=$repo_url/${repo}.git
 
 if [ "${BUILD_NUMBER}" -eq 0 ]; then