From d0e4b1fe59e6051f3798a1997392490dde4f2a79 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 29 Aug 2017 15:17:56 -0700 Subject: [PATCH 1/2] Adds support for raspbian stretch Basically uses the jessie repo for raspbian stretch due to raspbian jessie download links being taken off the official raspbian site. Signed-off-by: Eli Uriegas --- Jenkinsfile | 1 + Makefile | 10 ++++++++++ install.sh | 6 +++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0c78e99..47ef1a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,6 +14,7 @@ def verifyTargets = [ def armhfverifyTargets = [ 'armhf-verify-install-raspbian-jessie', + 'armhf-verify-install-raspbian-stretch', 'armhf-verify-install-debian-jessie', 'armhf-verify-install-debian-stretch', 'armhf-verify-install-ubuntu-trusty', diff --git a/Makefile b/Makefile index bc743ed..bf1c208 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,16 @@ armhf-verify-install-raspbian-jessie: resin/rpi-raspbian:jessie \ /v/verify-docker-install | tee $@ +armhf-verify-install-raspbian-stretch: + mkdir -p build + sed 's/DEFAULT_CHANNEL_VALUE="test"/DEFAULT_CHANNEL_VALUE="$(CHANNEL_TO_TEST)"/' install.sh > build/install.sh + set -o pipefail && docker run \ + --rm \ + -v $(CURDIR):/v \ + -w /v \ + resin/rpi-raspbian:stretch \ + /v/verify-docker-install | tee $@ + armhf-verify-install-%: mkdir -p build sed 's/DEFAULT_CHANNEL_VALUE="test"/DEFAULT_CHANNEL_VALUE="$(CHANNEL_TO_TEST)"/' install.sh > build/install.sh diff --git a/install.sh b/install.sh index 65044b9..92b2933 100644 --- a/install.sh +++ b/install.sh @@ -49,6 +49,8 @@ s390x-ubuntu-zesty aarch64-ubuntu-xenial armv6l-raspbian-jessie armv7l-raspbian-jessie +armv6l-raspbian-stretch +armv7l-raspbian-stretch armv7l-debian-jessie armv7l-debian-stretch armv7l-ubuntu-trusty @@ -505,7 +507,9 @@ do_install() { apt_get_update ( set -x; $sh_c 'sleep 3; apt-get install -y -q dirmngr' ) fi - + if [ "$dist_version" = "stretch" ]; then + dist_version="jessie" + fi ( set -x echo "$docker_key" | $sh_c 'apt-key add -' From f4956497c1792bdb60505183422bc919aaab3679 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 29 Aug 2017 16:33:11 -0700 Subject: [PATCH 2/2] Add shellcheck, disable trusty armhf test Signed-off-by: Eli Uriegas --- Jenkinsfile | 10 +++++++++- Makefile | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 47ef1a2..614f034 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,8 @@ def armhfverifyTargets = [ 'armhf-verify-install-raspbian-stretch', 'armhf-verify-install-debian-jessie', 'armhf-verify-install-debian-stretch', - 'armhf-verify-install-ubuntu-trusty', + // TEMPORARY: security.ubuntu.com is returning a 404 for trusty armhf, support may have ended + // 'armhf-verify-install-ubuntu-trusty', 'armhf-verify-install-ubuntu-xenial', 'armhf-verify-install-ubuntu-zesty', ] @@ -47,6 +48,13 @@ def genVerifyJob(String t, String label) { } ] } +wrappedNode(label: 'aufs', cleanWorkspace: true) { + stage('Shellcheck') { + checkout scm + sh('make shellcheck') + } +} + def verifyJobs = [:] for (t in verifyTargets) { verifyJobs << genVerifyJob(t, 'aufs') diff --git a/Makefile b/Makefile index bf1c208..cfba215 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,8 @@ SHELL:=/bin/bash DISTROS:=centos-7 fedora-24 fedora-25 debian-wheezy debian-jessie debian-stretch ubuntu-trusty ubuntu-xenial ubuntu-yakkety ubuntu-zesty VERIFY_INSTALL_DISTROS:=$(addprefix x86_64-verify-install-,$(DISTROS)) CHANNEL_TO_TEST?=test -SHELLCHECK=shellcheck +SHELLCHECK_EXCLUSIONS=$(addprefix -e, SC1091 SC1117) +SHELLCHECK=docker run --rm -v "$(CURDIR)":/v -w /v koalaman/shellcheck $(SHELLCHECK_EXCLUSIONS) .PHONY: shellcheck shellcheck: