aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtrusty-arm64-tcwg-test/build.sh5
-rwxr-xr-xtrusty-arm64-tcwg/build.sh5
-rwxr-xr-xtrusty-armhf-tcwg-test/build.sh5
-rwxr-xr-xtrusty-armhf-tcwg/build.sh5
-rwxr-xr-xtrusty-i386-tcwg/build.sh2
-rwxr-xr-xxenial-arm64-tcwg-build/build.sh5
-rwxr-xr-xxenial-arm64-tcwg-test/build.sh5
-rwxr-xr-xxenial-armhf-tcwg-build/build.sh5
-rwxr-xr-xxenial-armhf-tcwg-test/build.sh5
-rwxr-xr-xxenial-i386-tcwg-build/build.sh2
10 files changed, 34 insertions, 10 deletions
diff --git a/trusty-arm64-tcwg-test/build.sh b/trusty-arm64-tcwg-test/build.sh
index 5a74c33..738c4cd 100755
--- a/trusty-arm64-tcwg-test/build.sh
+++ b/trusty-arm64-tcwg-test/build.sh
@@ -10,7 +10,10 @@ cleanup_exit()
}
export LANG=C
+distro=$(basename ${PWD} | cut -f1 -d '-')
+arch=$(basename ${PWD} | cut -f2 -d '-')
+name=$(basename ${PWD} | cut -f3- -d '-')
rsync -a ../tcwg-buildslave/ ./tcwg-buildslave/
-docker build --pull --tag=linaro/$(basename ${PWD}) .
+docker build --pull --tag=linaro/ci-${arch}-${name}-ubuntu:${distro} .
diff --git a/trusty-arm64-tcwg/build.sh b/trusty-arm64-tcwg/build.sh
index 5a74c33..738c4cd 100755
--- a/trusty-arm64-tcwg/build.sh
+++ b/trusty-arm64-tcwg/build.sh
@@ -10,7 +10,10 @@ cleanup_exit()
}
export LANG=C
+distro=$(basename ${PWD} | cut -f1 -d '-')
+arch=$(basename ${PWD} | cut -f2 -d '-')
+name=$(basename ${PWD} | cut -f3- -d '-')
rsync -a ../tcwg-buildslave/ ./tcwg-buildslave/
-docker build --pull --tag=linaro/$(basename ${PWD}) .
+docker build --pull --tag=linaro/ci-${arch}-${name}-ubuntu:${distro} .
diff --git a/trusty-armhf-tcwg-test/build.sh b/trusty-armhf-tcwg-test/build.sh
index 5a74c33..738c4cd 100755
--- a/trusty-armhf-tcwg-test/build.sh
+++ b/trusty-armhf-tcwg-test/build.sh
@@ -10,7 +10,10 @@ cleanup_exit()
}
export LANG=C
+distro=$(basename ${PWD} | cut -f1 -d '-')
+arch=$(basename ${PWD} | cut -f2 -d '-')
+name=$(basename ${PWD} | cut -f3- -d '-')
rsync -a ../tcwg-buildslave/ ./tcwg-buildslave/
-docker build --pull --tag=linaro/$(basename ${PWD}) .
+docker build --pull --tag=linaro/ci-${arch}-${name}-ubuntu:${distro} .
diff --git a/trusty-armhf-tcwg/build.sh b/trusty-armhf-tcwg/build.sh
index 5a74c33..738c4cd 100755
--- a/trusty-armhf-tcwg/build.sh
+++ b/trusty-armhf-tcwg/build.sh
@@ -10,7 +10,10 @@ cleanup_exit()
}
export LANG=C
+distro=$(basename ${PWD} | cut -f1 -d '-')
+arch=$(basename ${PWD} | cut -f2 -d '-')
+name=$(basename ${PWD} | cut -f3- -d '-')
rsync -a ../tcwg-buildslave/ ./tcwg-buildslave/
-docker build --pull --tag=linaro/$(basename ${PWD}) .
+docker build --pull --tag=linaro/ci-${arch}-${name}-ubuntu:${distro} .
diff --git a/trusty-i386-tcwg/build.sh b/trusty-i386-tcwg/build.sh
index ed2b6a7..738c4cd 100755
--- a/trusty-i386-tcwg/build.sh
+++ b/trusty-i386-tcwg/build.sh
@@ -16,4 +16,4 @@ name=$(basename ${PWD} | cut -f3- -d '-')
rsync -a ../tcwg-buildslave/ ./tcwg-buildslave/
-docker build --pull --tag=linaro/ci-${arch}-${name}-ubuntu:${distro} .
+docker build --pull --tag=linaro/ci-${arch}-${name}-ubuntu:${distro} .
diff --git a/xenial-arm64-tcwg-build/build.sh b/xenial-arm64-tcwg-build/build.sh
index 5a74c33..738c4cd 100755
--- a/xenial-arm64-tcwg-build/build.sh
+++ b/xenial-arm64-tcwg-build/build.sh
@@ -10,7 +10,10 @@ cleanup_exit()
}
export LANG=C
+distro=$(basename ${PWD} | cut -f1 -d '-')
+arch=$(basename ${PWD} | cut -f2 -d '-')
+name=$(basename ${PWD} | cut -f3- -d '-')
rsync -a ../tcwg-buildslave/ ./tcwg-buildslave/
-docker build --pull --tag=linaro/$(basename ${PWD}) .
+docker build --pull --tag=linaro/ci-${arch}-${name}-ubuntu:${distro} .
diff --git a/xenial-arm64-tcwg-test/build.sh b/xenial-arm64-tcwg-test/build.sh
index 5a74c33..738c4cd 100755
--- a/xenial-arm64-tcwg-test/build.sh
+++ b/xenial-arm64-tcwg-test/build.sh
@@ -10,7 +10,10 @@ cleanup_exit()
}
export LANG=C
+distro=$(basename ${PWD} | cut -f1 -d '-')
+arch=$(basename ${PWD} | cut -f2 -d '-')
+name=$(basename ${PWD} | cut -f3- -d '-')
rsync -a ../tcwg-buildslave/ ./tcwg-buildslave/
-docker build --pull --tag=linaro/$(basename ${PWD}) .
+docker build --pull --tag=linaro/ci-${arch}-${name}-ubuntu:${distro} .
diff --git a/xenial-armhf-tcwg-build/build.sh b/xenial-armhf-tcwg-build/build.sh
index 5a74c33..738c4cd 100755
--- a/xenial-armhf-tcwg-build/build.sh
+++ b/xenial-armhf-tcwg-build/build.sh
@@ -10,7 +10,10 @@ cleanup_exit()
}
export LANG=C
+distro=$(basename ${PWD} | cut -f1 -d '-')
+arch=$(basename ${PWD} | cut -f2 -d '-')
+name=$(basename ${PWD} | cut -f3- -d '-')
rsync -a ../tcwg-buildslave/ ./tcwg-buildslave/
-docker build --pull --tag=linaro/$(basename ${PWD}) .
+docker build --pull --tag=linaro/ci-${arch}-${name}-ubuntu:${distro} .
diff --git a/xenial-armhf-tcwg-test/build.sh b/xenial-armhf-tcwg-test/build.sh
index 5a74c33..738c4cd 100755
--- a/xenial-armhf-tcwg-test/build.sh
+++ b/xenial-armhf-tcwg-test/build.sh
@@ -10,7 +10,10 @@ cleanup_exit()
}
export LANG=C
+distro=$(basename ${PWD} | cut -f1 -d '-')
+arch=$(basename ${PWD} | cut -f2 -d '-')
+name=$(basename ${PWD} | cut -f3- -d '-')
rsync -a ../tcwg-buildslave/ ./tcwg-buildslave/
-docker build --pull --tag=linaro/$(basename ${PWD}) .
+docker build --pull --tag=linaro/ci-${arch}-${name}-ubuntu:${distro} .
diff --git a/xenial-i386-tcwg-build/build.sh b/xenial-i386-tcwg-build/build.sh
index ed2b6a7..738c4cd 100755
--- a/xenial-i386-tcwg-build/build.sh
+++ b/xenial-i386-tcwg-build/build.sh
@@ -16,4 +16,4 @@ name=$(basename ${PWD} | cut -f3- -d '-')
rsync -a ../tcwg-buildslave/ ./tcwg-buildslave/
-docker build --pull --tag=linaro/ci-${arch}-${name}-ubuntu:${distro} .
+docker build --pull --tag=linaro/ci-${arch}-${name}-ubuntu:${distro} .