{jessie,stretch,trusty,utopic,xenial}-{amd64,arm64,armhf}: fix build scripts

* docker COPY doesn't follow symlinks (it returns a lstat error)
  Restore stretch build scripts to copy thee files as before.
* Move OBS sources list and key files next to the others.
* Remove all the PPA fixup and copy explicitely sources list and keys we
  want.
* Fix the image/tag name jessie-amd64, xenial-adm64 and a few others.

Change-Id: I6613c5abc2bba8cbb05a65e0bf0dc17d4082cc1a
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

20 files changed, 62 insertions, 42 deletions

diff --git a/jessie-amd64/build.sh b/jessie-amd64/build.sh
index 10fdeafe..2b645dee 100755
--- a/jessie-amd64/build.sh
+++ b/jessie-amd64/build.sh
@@ -12,14 +12,12 @@ cleanup_exit()
 export LANG=C
 
 DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
+ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
 
 cp -a ../${DISTRIBUTION}.list linaro.list
-cp -a ../linaro-*.list ../linaro-*.key .
+cp -a ../linaro-overlay-repo.list ../linaro-overlay-repo.key .
 sed -e "s|@DISTRIBUTION@|${DISTRIBUTION}|" -i *.list
 
-# fixup - get rid of PPA usage
-rm -f linaro-*ppa.*
-
-image=linaro/$(basename ${PWD})
+image=linaro/ci-${ARCHITECTURE}-debian:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/jessie-arm64/build.sh b/jessie-arm64/build.sh
index 2cbd17e9..2b645dee 100755
--- a/jessie-arm64/build.sh
+++ b/jessie-arm64/build.sh
@@ -15,12 +15,9 @@ DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
 ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
 
 cp -a ../${DISTRIBUTION}.list linaro.list
-cp -a ../linaro-*.list ../linaro-*.key .
+cp -a ../linaro-overlay-repo.list ../linaro-overlay-repo.key .
 sed -e "s|@DISTRIBUTION@|${DISTRIBUTION}|" -i *.list
 
-# fixup - get rid of PPA usage
-rm -f linaro-*ppa.*
-
 image=linaro/ci-${ARCHITECTURE}-debian:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/jessie-armhf/build.sh b/jessie-armhf/build.sh
index 2cbd17e9..2b645dee 100755
--- a/jessie-armhf/build.sh
+++ b/jessie-armhf/build.sh
@@ -15,12 +15,9 @@ DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
 ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
 
 cp -a ../${DISTRIBUTION}.list linaro.list
-cp -a ../linaro-*.list ../linaro-*.key .
+cp -a ../linaro-overlay-repo.list ../linaro-overlay-repo.key .
 sed -e "s|@DISTRIBUTION@|${DISTRIBUTION}|" -i *.list
 
-# fixup - get rid of PPA usage
-rm -f linaro-*ppa.*
-
 image=linaro/ci-${ARCHITECTURE}-debian:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/stretch-amd64/linaro-overlay-obs.key b/linaro-overlay-obs.key
index 9a3b62dd..9a3b62dd 100644
--- a/stretch-amd64/linaro-overlay-obs.key
+++ b/linaro-overlay-obs.key
diff --git a/stretch-amd64/linaro-overlay-obs.list b/linaro-overlay-obs.list
index 87981100..87981100 100644
--- a/stretch-amd64/linaro-overlay-obs.list
+++ b/linaro-overlay-obs.list
diff --git a/stretch-amd64/build.sh b/stretch-amd64/build.sh
index ca4c1c00..155a1b39 100755
--- a/stretch-amd64/build.sh
+++ b/stretch-amd64/build.sh
@@ -1,10 +1,21 @@
-#!/bin/bash -e
+#!/bin/sh
+
+set -e
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+  rm -f *.list *.key
+}
 
 export LANG=C
 
 DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
 ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
 
+cp -a ../linaro-overlay-obs.list ../linaro-overlay-obs.key .
+
 image=linaro/ci-${ARCHITECTURE}-debian:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/stretch-arm64/build.sh b/stretch-arm64/build.sh
index ca4c1c00..155a1b39 100755
--- a/stretch-arm64/build.sh
+++ b/stretch-arm64/build.sh
@@ -1,10 +1,21 @@
-#!/bin/bash -e
+#!/bin/sh
+
+set -e
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+  rm -f *.list *.key
+}
 
 export LANG=C
 
 DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
 ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
 
+cp -a ../linaro-overlay-obs.list ../linaro-overlay-obs.key .
+
 image=linaro/ci-${ARCHITECTURE}-debian:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/stretch-arm64/linaro-overlay-obs.key b/stretch-arm64/linaro-overlay-obs.key
deleted file mode 120000
index 17b93d7f..00000000
--- a/stretch-arm64/linaro-overlay-obs.key
+++ /dev/null
@@ -1 +0,0 @@
-../stretch-amd64/linaro-overlay-obs.key
\ No newline at end of file
diff --git a/stretch-arm64/linaro-overlay-obs.list b/stretch-arm64/linaro-overlay-obs.list
deleted file mode 120000
index e5e148b8..00000000
--- a/stretch-arm64/linaro-overlay-obs.list
+++ /dev/null
@@ -1 +0,0 @@
-../stretch-amd64/linaro-overlay-obs.list
\ No newline at end of file
diff --git a/stretch-armhf/build.sh b/stretch-armhf/build.sh
index ca4c1c00..155a1b39 100755
--- a/stretch-armhf/build.sh
+++ b/stretch-armhf/build.sh
@@ -1,10 +1,21 @@
-#!/bin/bash -e
+#!/bin/sh
+
+set -e
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+  rm -f *.list *.key
+}
 
 export LANG=C
 
 DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
 ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
 
+cp -a ../linaro-overlay-obs.list ../linaro-overlay-obs.key .
+
 image=linaro/ci-${ARCHITECTURE}-debian:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/stretch-armhf/linaro-overlay-obs.key b/stretch-armhf/linaro-overlay-obs.key
deleted file mode 120000
index 17b93d7f..00000000
--- a/stretch-armhf/linaro-overlay-obs.key
+++ /dev/null
@@ -1 +0,0 @@
-../stretch-amd64/linaro-overlay-obs.key
\ No newline at end of file
diff --git a/stretch-armhf/linaro-overlay-obs.list b/stretch-armhf/linaro-overlay-obs.list
deleted file mode 120000
index e5e148b8..00000000
--- a/stretch-armhf/linaro-overlay-obs.list
+++ /dev/null
@@ -1 +0,0 @@
-../stretch-amd64/linaro-overlay-obs.list
\ No newline at end of file
diff --git a/trusty-amd64-art/build.sh b/trusty-amd64-art/build.sh
index 15e8f8a0..14167821 100755
--- a/trusty-amd64-art/build.sh
+++ b/trusty-amd64-art/build.sh
@@ -4,6 +4,9 @@ set -e
 
 export LANG=C
 
-image=linaro/$(basename ${PWD})
+DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
+ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
+
+image=linaro/ci-${ARCHITECTURE}-art-ubuntu:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/trusty-arm64-openjdk/build.sh b/trusty-arm64-openjdk/build.sh
index 15e8f8a0..a85576ac 100755
--- a/trusty-arm64-openjdk/build.sh
+++ b/trusty-arm64-openjdk/build.sh
@@ -4,6 +4,9 @@ set -e
 
 export LANG=C
 
-image=linaro/$(basename ${PWD})
+DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
+ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
+
+image=linaro/ci-${ARCHITECTURE}-openjdk-ubuntu:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/utopic-amd64-art/build.sh b/utopic-amd64-art/build.sh
index ce90ce78..c4f6cc75 100755
--- a/utopic-amd64-art/build.sh
+++ b/utopic-amd64-art/build.sh
@@ -11,8 +11,11 @@ cleanup_exit()
 
 export LANG=C
 
+DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
+ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
+
 cp -a ../setup-sshd .
 
-image=linaro/$(basename ${PWD})
+image=linaro/ci-${ARCHITECTURE}-art-ubuntu:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/utopic-amd64/build.sh b/utopic-amd64/build.sh
index 55620b0b..58fb2bf2 100755
--- a/utopic-amd64/build.sh
+++ b/utopic-amd64/build.sh
@@ -12,10 +12,11 @@ cleanup_exit()
 export LANG=C
 
 DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
+ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
 
 cp -a ../linaro-*.list ../linaro-*.key .
 sed -e "s|@DISTRIBUTION@|${DISTRIBUTION}|" -i *.list
 
-image=linaro/$(basename ${PWD}
+image=linaro/ci-${ARCHITECTURE}-ubuntu:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/xenial-amd64-chromium/build.sh b/xenial-amd64-chromium/build.sh
index 05232457..7b8d1454 100755
--- a/xenial-amd64-chromium/build.sh
+++ b/xenial-amd64-chromium/build.sh
@@ -12,13 +12,11 @@ cleanup_exit()
 export LANG=C
 
 DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
+ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
 
-cp -a ../linaro-*.list ../linaro-*.key .
+cp -a ../linaro-overlay-repo.list ../linaro-overlay-repo.key .
 sed -e "s|@DISTRIBUTION@|${DISTRIBUTION}|" -i *.list
 
-# fixup - get rid of PPA usage
-rm -f linaro-*ppa.*
-
-image=linaro/$(basename ${PWD})
+image=linaro/ci-${ARCHITECTURE}-chromium-ubuntu:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/xenial-amd64/build.sh b/xenial-amd64/build.sh
index 52715e16..1203ab3b 100755
--- a/xenial-amd64/build.sh
+++ b/xenial-amd64/build.sh
@@ -14,12 +14,9 @@ export LANG=C
 DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
 ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
 
-cp -a ../linaro-*.list ../linaro-*.key .
+cp -a ../linaro-overlay-repo.list ../linaro-overlay-repo.key .
 sed -e "s|@DISTRIBUTION@|${DISTRIBUTION}|" -i *.list
 
-# fixup - get rid of PPA usage
-rm -f linaro-*ppa.*
-
 image=linaro/ci-${ARCHITECTURE}-ubuntu:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/xenial-arm64/build.sh b/xenial-arm64/build.sh
index ff1e1661..1203ab3b 100755
--- a/xenial-arm64/build.sh
+++ b/xenial-arm64/build.sh
@@ -14,12 +14,9 @@ export LANG=C
 DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
 ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
 
-cp -a ../linaro-*.list ../linaro-*.key .
+cp -a ../linaro-overlay-repo.list ../linaro-overlay-repo.key .
 sed -e "s|@DISTRIBUTION@|${DISTRIBUTION}|" -i *.list
 
-# fixup - get rid of PPA usage
-rm -f linaro-*ppa.*
-
-image=linaro/ci-${ARCHITECTURE}-ubuntu:${DISTRIBUTION} .
+image=linaro/ci-${ARCHITECTURE}-ubuntu:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag
diff --git a/xenial-armhf/build.sh b/xenial-armhf/build.sh
index 52715e16..1203ab3b 100755
--- a/xenial-armhf/build.sh
+++ b/xenial-armhf/build.sh
@@ -14,12 +14,9 @@ export LANG=C
 DISTRIBUTION=$(basename ${PWD} | cut -f1 -d '-')
 ARCHITECTURE=$(basename ${PWD} | cut -f2 -d '-')
 
-cp -a ../linaro-*.list ../linaro-*.key .
+cp -a ../linaro-overlay-repo.list ../linaro-overlay-repo.key .
 sed -e "s|@DISTRIBUTION@|${DISTRIBUTION}|" -i *.list
 
-# fixup - get rid of PPA usage
-rm -f linaro-*ppa.*
-
 image=linaro/ci-${ARCHITECTURE}-ubuntu:${DISTRIBUTION}
 docker build --pull --tag=$image .
 echo $image > .docker-tag