Return-Path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=profusion-mobi.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2VKUPRVPjgAZYkGmdszbFMA4IGIa4TnUThlMhVJAcsU=; b=BDujiNZ2L6XHM65QfKEQ6Q/PWCwOvrH7UjZeNZ0FXxmRe0FGVDKH2+Zs0dkEy0uK2J Bk4eIvo5TIHUo7FRqroCwFNhjQf2pn8d+jAs4Faq4IGPifLzah91zRLxAW+pMuooORw2 dN8xbqv9sV524adH04IPnbpJjEiALJwOCKsyvMg6hEeY2Pu+qysLzurGDO+un08nA6S8 kBimu2uTqQkXq93BC4vjTz/Xvy9PSP0yR83JFJJNRVS2G0fwLxa/hs3RgU50h+GgbHRA 2IfN4ve8z56eZFLA3GXV4en4qZP0mq2NfQnZjOvNzwbBLVaIfiVrzyb2kIfvSReTpoUd sDsg== From: Guilherme Campos Camargo Date: Wed, 2 May 2018 18:27:12 -0300 Message-Id: <20180502212714.26461-2-guicc@profusion.mobi> In-Reply-To: <20180502212714.26461-1-guicc@profusion.mobi> References: <20180502212714.26461-1-guicc@profusion.mobi> Subject: [Fuego] [PATCH 1/3] Install Fuego Release Test dependencies and add fuego-test board List-Id: Mailing list for the Fuego test framework List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: fuego@lists.linuxfoundation.org A new session has been added to the Dockerfile, mainly responsible for installing the Docker binary, pexpect and seleniumHQ (that are needed for Fuego to test a new Fuego release). Also, a fuego-test board (a simple loopback that points to localhost) has been added. The create scripts have also been modified to allow mapping the hosts' dockerd socket into the container. By doing this we allow Fuego and the host to share the same docker daemon. --- Dockerfile | 48 +++++++++++++++++++ fuego-host-scripts/docker-create-container.sh | 1 + .../docker-create-usb-privileged-container.sh | 1 + fuego-ro/boards/fuego-test.board | 13 +++++ 4 files changed, 63 insertions(+) create mode 100644 fuego-ro/boards/fuego-test.board diff --git a/Dockerfile b/Dockerfile index cc995d6..f148cf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,6 +61,54 @@ RUN echo "${JENKINS_SHA} jenkins_${JENKINS_VERSION}_all.deb" | sha1sum -c - RUN dpkg -i jenkins_${JENKINS_VERSION}_all.deb RUN rm jenkins_${JENKINS_VERSION}_all.deb + +# ============================================================================== +# Install Fuego Release Test Dependencies +# ============================================================================== + +# TODO: This session should be moved to a separate Dockerfile in the future, +# that simply extends a fuego-base image and compiles a Fuego that's capable of +# testing itself. + +# Install Dependencies +RUN apt-get update && \ + apt-get -yV install \ + apt-transport-https \ + ca-certificates \ + chromium \ + curl \ + gnupg2 \ + python3 \ + python3-pip \ + software-properties-common && \ + pip3 install \ + docker \ + pexpect \ + selenium + +# Install Docker +RUN curl -fsSL https://download.docker.com/linux/$(source /etc/os-release; \ + echo "$ID")/gpg | sudo apt-key add - && \ + add-apt-repository \ + "deb [arch=amd64] https://download.docker.com/linux/$(\ + source /etc/os-release; echo "$ID") $(lsb_release -cs) stable" && \ + apt-get update && \ + apt-get -yV install \ + docker-ce + +# Install Chrome Driver for SeleniumHQ +RUN CHROME_DRIVER_VERSION=$(curl --silent --fail \ + https://chromedriver.storage.googleapis.com/LATEST_RELEASE) && \ + curl https://chromedriver.storage.googleapis.com/$(\ + echo ${CHROME_DRIVER_VERSION})/chromedriver_linux64.zip \ + -o chrome-driver.zip && \ + unzip chrome-driver.zip -d /usr/local/bin && rm chrome-driver.zip && \ + chmod +x /usr/local/bin/chromedriver + +# Setting jenkins as a sudoer. Needed for accessing the dockerd socket. +RUN echo "jenkins ALL = (root) NOPASSWD:ALL" >> /etc/sudoers + + # ============================================================================== # get ttc script and helpers # ============================================================================== diff --git a/fuego-host-scripts/docker-create-container.sh b/fuego-host-scripts/docker-create-container.sh index 20f4b59..59cce3d 100755 --- a/fuego-host-scripts/docker-create-container.sh +++ b/fuego-host-scripts/docker-create-container.sh @@ -18,6 +18,7 @@ if [ ! -d $DIR/../../fuego-core ]; then fi sudo docker create -it --name ${DOCKERCONTAINER} \ + -v /var/run/docker.sock:/var/run/docker.sock \ -v /boot:/boot:ro \ -v $DIR/../fuego-rw:/fuego-rw \ -v $DIR/../fuego-ro:/fuego-ro:ro \ diff --git a/fuego-host-scripts/docker-create-usb-privileged-container.sh b/fuego-host-scripts/docker-create-usb-privileged-container.sh index b3a55c4..b4c7f5b 100755 --- a/fuego-host-scripts/docker-create-usb-privileged-container.sh +++ b/fuego-host-scripts/docker-create-usb-privileged-container.sh @@ -19,6 +19,7 @@ fi sudo docker create -it --name ${DOCKERCONTAINER} \ --privileged \ + -v /var/run/docker.sock:/var/run/docker.sock \ -v /boot:/boot:ro \ -v /dev/bus/usb:/dev/bus/usb \ -v /dev/ttyACM0:/dev/ttyACM0 \ diff --git a/fuego-ro/boards/fuego-test.board b/fuego-ro/boards/fuego-test.board new file mode 100644 index 0000000..185e0b4 --- /dev/null +++ b/fuego-ro/boards/fuego-test.board @@ -0,0 +1,13 @@ +inherit "base-board" +include "base-params" + +IPADDR=127.0.0.1 +SRV_IP=127.0.0.1 +#LOGIN="root" +#PASSWORD="root" +#SSH_KEY="path/to/id_rsa" +BOARD_TESTDIR="$FUEGO_RW/tests" +PLATFORM="x86_64" +TRANSPORT="local" +ARCHITECTURE="x86_64" +DISTRIB="nosyslogd.dist" -- 2.17.0