From 6cfdb7189426f29e858ebe8dc218d1da9c5c3a7d Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 2 Mar 2019 15:48:39 -0800 Subject: Install Python3 from EPEL on CentOS7 Signed-off-by: Alexey Neyman --- testing/docker/centos7/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'testing/docker') diff --git a/testing/docker/centos7/Dockerfile b/testing/docker/centos7/Dockerfile index b0f928d6..0631c19e 100644 --- a/testing/docker/centos7/Dockerfile +++ b/testing/docker/centos7/Dockerfile @@ -3,8 +3,10 @@ ARG CTNG_UID ARG CTNG_GID RUN groupadd -g $CTNG_GID ctng RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng +RUN yum install -y epel-release RUN yum install -y autoconf gperf bison file flex texinfo help2man gcc-c++ libtool make patch \ - ncurses-devel python-devel perl-Thread-Queue bzip2 git wget which xz unzip + ncurses-devel python36-devel perl-Thread-Queue bzip2 git wget which xz unzip +RUN ln -sf python36 /usr/bin/python3 RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 RUN chmod a+x /sbin/dumb-init RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile -- cgit v1.2.3 From 8d65fc7fc2796091be97fd37a52abd797f9d5c9a Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 2 Mar 2019 15:49:25 -0800 Subject: Detect errors in each container if running an action ... in more than one; then complain at the end. Signed-off-by: Alexey Neyman --- testing/docker/dmgr.sh | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'testing/docker') diff --git a/testing/docker/dmgr.sh b/testing/docker/dmgr.sh index 1330867e..825362a9 100755 --- a/testing/docker/dmgr.sh +++ b/testing/docker/dmgr.sh @@ -3,11 +3,19 @@ # Run from the directory containing this script cd `dirname $0` +# Global return code (flags an error if any of the actions fail) +global_rc=0 + msg() { echo "INFO :: $*" >&2 } +warn() +{ + echo "WARN :: $*" >&2 +} + error() { echo "ERROR :: $*" >&2 @@ -52,6 +60,8 @@ action_build() { local cntr=$1 + msg "Cleaning up previous runs for ${cntr}" + do_cleanup ${cntr}/{build,install,xtools} msg "Building Docker container for ${cntr}" set -x docker build --no-cache -t "ctng-${cntr}" --build-arg CTNG_GID=`id -g` --build-arg CTNG_UID=`id -u` "${cntr}" @@ -81,6 +91,9 @@ _dckr() else $prefix su -l ctng fi + if [ $? != 0 ]; then + global_rc=1 + fi } # Run the test @@ -91,8 +104,11 @@ action_install() # The test assumes the top directory is bootstrapped, but clean. msg "Setting up crosstool-NG in ${cntr}" do_cleanup ${cntr}/build - _dckr "${cntr}" /common-scripts/ctng-install && \ - _dckr "${cntr}" /common-scripts/ctng-test-basic + if ! _dckr "${cntr}" /common-scripts/ctng-install; then + warn "Installation failed" + elif ! _dckr "${cntr}" /common-scripts/ctng-test-basic; then + warn "Basic tests failed" + fi } # Run the test @@ -164,3 +180,7 @@ case "${action}" in usage "Unknown action ${action}." ;; esac +if [ "${global_rc}" != 0 ]; then + error "Some of the actions failed, see warnings above" +fi +exit ${global_rc} -- cgit v1.2.3 From da11216f8d2630a3a3409ae17549bc0f472d64b6 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Mon, 4 Mar 2019 00:21:22 -0800 Subject: Centos6 also needs python3 Signed-off-by: Alexey Neyman --- testing/docker/centos6/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'testing/docker') diff --git a/testing/docker/centos6/Dockerfile b/testing/docker/centos6/Dockerfile index c3a0da8f..6c224cd4 100644 --- a/testing/docker/centos6/Dockerfile +++ b/testing/docker/centos6/Dockerfile @@ -3,8 +3,9 @@ ARG CTNG_UID ARG CTNG_GID RUN groupadd -g $CTNG_GID ctng RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng +RUN yum install -y epel-release RUN yum install -y autoconf gperf bison flex texinfo help2man gcc-c++ libtool libtool-bin patch \ - ncurses-devel python-devel perl-Thread-Queue bzip2 git wget xz unzip + ncurses-devel python34-devel perl-Thread-Queue bzip2 git wget xz unzip RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 RUN chmod a+x /sbin/dumb-init RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile -- cgit v1.2.3 From b9e3a7de9ca2a0b700264d8294242fc7db3bf2e4 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 14 Mar 2019 23:57:17 -0700 Subject: Use fedora29 as a reference Signed-off-by: Alexey Neyman --- testing/docker/fedora28/Dockerfile | 11 ----------- testing/docker/fedora29/Dockerfile | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 testing/docker/fedora28/Dockerfile create mode 100644 testing/docker/fedora29/Dockerfile (limited to 'testing/docker') diff --git a/testing/docker/fedora28/Dockerfile b/testing/docker/fedora28/Dockerfile deleted file mode 100644 index 20363c9c..00000000 --- a/testing/docker/fedora28/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM fedora:28 -ARG CTNG_UID -ARG CTNG_GID -RUN groupadd -g $CTNG_GID ctng -RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng -RUN yum install -y autoconf gperf bison file flex texinfo help2man gcc-c++ libtool make patch \ - ncurses-devel python-devel perl-Thread-Queue bzip2 git wget which xz unzip -RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 -RUN chmod a+x /sbin/dumb-init -RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile -ENTRYPOINT [ "/sbin/dumb-init", "--" ] diff --git a/testing/docker/fedora29/Dockerfile b/testing/docker/fedora29/Dockerfile new file mode 100644 index 00000000..04b42a66 --- /dev/null +++ b/testing/docker/fedora29/Dockerfile @@ -0,0 +1,11 @@ +FROM fedora:29 +ARG CTNG_UID +ARG CTNG_GID +RUN groupadd -g $CTNG_GID ctng +RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng +RUN yum install -y autoconf gperf bison file flex texinfo help2man gcc-c++ libtool make patch \ + ncurses-devel python-devel perl-Thread-Queue bzip2 git wget which xz unzip +RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 +RUN chmod a+x /sbin/dumb-init +RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile +ENTRYPOINT [ "/sbin/dumb-init", "--" ] -- cgit v1.2.3 From 48489ebb9de1ea1fbb21c107aca7351bbd4e8b7c Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 15 Mar 2019 12:13:42 -0700 Subject: Note the experimental status of Alpine I don't have the time to fix all the various breakages it shows. Signed-off-by: Alexey Neyman --- testing/docker/alpine3.8/EXPERIMENTAL | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 testing/docker/alpine3.8/EXPERIMENTAL (limited to 'testing/docker') diff --git a/testing/docker/alpine3.8/EXPERIMENTAL b/testing/docker/alpine3.8/EXPERIMENTAL new file mode 100644 index 00000000..4d4d6d7a --- /dev/null +++ b/testing/docker/alpine3.8/EXPERIMENTAL @@ -0,0 +1,11 @@ +Support for Alpine Linux as a build or host platform is EXPERIMENTAL. Some of +the packages try to compile binaries for the build or the machine and fail +because they expect certain GLIBC-specific types, etc: Alpine Linux does not +use GNU libc, it uses musl. + +Only the following bug reports will be looked into: +- A sample configuration used to build successfully and no longer does. Identify +the commit ID that builds successfully for you. +- A pull request that fixes the build for any sample on the Alpine Linux. + +All other bug reports against Alpine as a build/host will be summarily closed. -- cgit v1.2.3 From 3be2ba2f0d3cb8264f1cfa03b1359823c11e6b22 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 15 Mar 2019 12:14:53 -0700 Subject: Install python3 on Fedora29 GDB doesn't accept older 2.x as a valid choice. Signed-off-by: Alexey Neyman --- testing/docker/fedora29/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing/docker') diff --git a/testing/docker/fedora29/Dockerfile b/testing/docker/fedora29/Dockerfile index 04b42a66..65a0c60e 100644 --- a/testing/docker/fedora29/Dockerfile +++ b/testing/docker/fedora29/Dockerfile @@ -4,7 +4,7 @@ ARG CTNG_GID RUN groupadd -g $CTNG_GID ctng RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng RUN yum install -y autoconf gperf bison file flex texinfo help2man gcc-c++ libtool make patch \ - ncurses-devel python-devel perl-Thread-Queue bzip2 git wget which xz unzip + ncurses-devel python3-devel perl-Thread-Queue bzip2 git wget which xz unzip RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 RUN chmod a+x /sbin/dumb-init RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile -- cgit v1.2.3 From e4475c33df8702ec780f24ac482d5d9c2fc72d6d Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 17 Mar 2019 11:28:54 -0700 Subject: Install python3 in Mint Signed-off-by: Alexey Neyman --- testing/docker/mint19-amd64/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing/docker') diff --git a/testing/docker/mint19-amd64/Dockerfile b/testing/docker/mint19-amd64/Dockerfile index 7a0e4ba6..2b4f1aef 100644 --- a/testing/docker/mint19-amd64/Dockerfile +++ b/testing/docker/mint19-amd64/Dockerfile @@ -5,7 +5,7 @@ RUN groupadd -g $CTNG_GID ctng RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng RUN apt-get update RUN apt-get install -y gcc gperf bison flex texinfo help2man make libncurses5-dev \ - python-dev autoconf automake libtool libtool-bin gawk wget + python3-dev autoconf automake libtool libtool-bin gawk wget RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 RUN chmod a+x /sbin/dumb-init RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile -- cgit v1.2.3