Update iar-docker-images job
Remove test code
Signed-off-by: Arthur She <arthur.she@linaro.org>
Change-Id: Ic0b9c9a1193aecea4b57ad2c03e8ef2be13c32ef
diff --git a/iar-docker-images.yaml b/iar-docker-images.yaml
index b9b040d..8ec7749 100644
--- a/iar-docker-images.yaml
+++ b/iar-docker-images.yaml
@@ -7,12 +7,9 @@
days-to-keep: 500
num-to-keep: 30
disabled: false
- # Test build job on TF-02
- # node: build-amd64
- # Run on EC2
node: build-amd64-private
concurrent: false
- display-name: 'TF-M IAR Docker images build job'
+ display-name: 'TF-M IAR Docker images builder'
parameters:
- string:
name: GERRIT_PROJECT
diff --git a/iar-docker-images/builders.sh b/iar-docker-images/builders.sh
index 4fd4a20..ce2e29a 100755
--- a/iar-docker-images/builders.sh
+++ b/iar-docker-images/builders.sh
@@ -4,37 +4,27 @@
docker --version
-ON_EC2="0"
-if [ -f /sys/hypervisor/uuid ] && grep -q ^ec2 /sys/hypervisor/uuid; then
- ON_EC2="1"
-fi
-
cd iar-dockerfiles
-if [ "${ON_EC2}" == "1" ]; then
- if ! type aws
- then
- sudo apt-get -y -qq update
- sudo apt-get -y -qq install --no-install-recommends unzip
- curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
- unzip awscliv2.zip
- sudo ./aws/install
- fi
- aws configure list
- ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com
- export IAR_ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com/iar
- # Get armclang toolchain
- aws s3 cp --recursive s3://trustedfirmware-private/armclang/ .
- # Get IAR toolchain binary
- aws s3 cp --recursive s3://trustedfirmware-iar/ .
- find .
- aws ecr get-login-password --region us-east-1|docker login --username AWS --password-stdin $ECR
-else
- # Test on TF-02, copy armclang and IAR toolchain to the working dir
- ls -l
- cp /home/arthur.she/toolchain/* .
+if ! type aws
+then
+ sudo apt-get -y -qq update
+ sudo apt-get -y -qq install --no-install-recommends unzip
+ curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+ unzip awscliv2.zip
+ sudo ./aws/install
fi
+aws configure list
+ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com
+export IAR_ECR=987685672616.dkr.ecr.us-east-1.amazonaws.com/iar
+# Get armclang toolchain
+aws s3 cp --recursive s3://trustedfirmware-private/armclang/ .
+# Get IAR toolchain binary
+aws s3 cp --recursive s3://trustedfirmware-iar/ .
+find .
+aws ecr get-login-password --region us-east-1|docker login --username AWS --password-stdin $ECR
+
image=$(dirname $(find . -name build.sh))
test -d $image && test -f $image/build.sh && \
(
@@ -45,5 +35,4 @@
[ -f ".docker-tag" ] && tag=$(cat .docker-tag) || (echo "Docker image built failed!"; exit 1)
echo "Uploading image: ${tag}"
docker push $tag
- rm -f /tmp/dckr-img-err
)