diff options
| author | Rob Savoye <rob.savoye@linaro.org> | 2016-06-15 20:03:31 -0600 |
|---|---|---|
| committer | Rob Savoye <rob.savoye@linaro.org> | 2016-06-15 20:03:31 -0600 |
| commit | 3bbc4eb081e78eac8a42184a99389a8de6e66825 (patch) | |
| tree | 0918172a2e1496cab2eeaff60066c9a4080b769f | |
| parent | 5bb6b6cf09f2e616f1d0ce428a8f54745734a75e (diff) | |
Improve image list labeling.
| -rwxr-xr-x | TestRelease.job | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/TestRelease.job b/TestRelease.job index 5fe866c..c47e5e1 100755 --- a/TestRelease.job +++ b/TestRelease.job @@ -13,7 +13,6 @@ usage() bash TestRelease.job [--help] [OPTIONS] --tarball The URL of the tarvall to download. --workspace The directory to do all the work in. - --branch The branch of tcwg-jenkins to use. --docker The docker image to use. --help Print this message. EOF @@ -22,13 +21,23 @@ EOF # Set defaults user_workspace=$PWD -branch="refs/heads/master" container="" tag="" hub="docker.io" -imagelist="debian:jessie centos:7 centos:6 fedora:23 fedora:22 ubuntu:xenial ubuntu:trusty suse:12 suse:13" -OPTS="`getopt -o w:t:b:d:hv -l tarball:,workspace:,branch:,docker:,help,verbose`" +# List of versions of popular distributions. These tags ideally need to +# exist already on the builder. This naming convention for images is +# consistent, and there is supprt to download the image from the docker +# hub if the name matches any image. Potentially any image name can be +# used, but this is easier on the person maintaining the containers. +debianimgs="debian:jessie" +suseimgs="suse:12 suse:13" +centosimgs="centos:7 centos:6" +fedoraimgs="fedora:23 fedora:22" +ubuntuimgs="ubuntu:xenial ubuntu:trusty" +imagelist="${debianimgs} ${suseimgs} ${centosimgs} ${fedoraimgs} ${ubuntuimgs}" + +OPTS="`getopt -o w:t:d:hv -l tarball:,workspace:,docker:,help,verbose`" while test $# -gt 0; do case $1 in -w|--workspace) @@ -37,9 +46,6 @@ while test $# -gt 0; do -t|--tarball) tarball=$2 ;; - -b|--branch) - branch=$2 - ;; -d|--docker) container=`echo $2 | cut -d ':' -f 1` tag=`echo $2 | cut -d ':' -f 2`; @@ -55,15 +61,6 @@ while test $# -gt 0; do shift done -if test -e ${user_workspace}; then - cat << EOF > ${user_workspace}/BUILD-INFO.txt -Format-Version: 0.5 - -Files-Pattern: * -License-Type: open -EOF -fi - testdir=${user_workspace}/_test # testdir=${user_workspace}/_test.$$ |