From 6d66446d123adb8e87ac293fa2570716e2f7fe4d Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Thu, 9 Apr 2015 20:18:01 -0700 Subject: [PATCH 1/4] Add shell2junit for use of creating junit reports of the tests. NOTE: sh2ju is under the ASF2 license --- build/LICENSE.sh2ju | 172 ++++++++++++++++++++++++++++++++++++++++++++ build/sh2ju.sh | 131 +++++++++++++++++++++++++++++++++ 2 files changed, 303 insertions(+) create mode 100644 build/LICENSE.sh2ju create mode 100755 build/sh2ju.sh diff --git a/build/LICENSE.sh2ju b/build/LICENSE.sh2ju new file mode 100644 index 00000000..a03114bc --- /dev/null +++ b/build/LICENSE.sh2ju @@ -0,0 +1,172 @@ + Shell2Junit License Information + +Feb, 2010 + +shell2junit library and sample code is licensed under Apache License, v.2.0. + +(c) 2009 Manolo Carrasco (Manuel Carrasco Moñino) + +===== + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the +copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other +entities that control, are controlled by, or are under common control with +that entity. For the purposes of this definition, "control" means (i) the +power, direct or indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (ii) ownership of fifty percent +(50%) or more of the outstanding shares, or (iii) beneficial ownership of +such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation source, and +configuration files. + +"Object" form shall mean any form resulting from mechanical transformation +or translation of a Source form, including but not limited to compiled +object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, +made available under the License, as indicated by a copyright notice that is +included in or attached to the work (an example is provided in the Appendix +below). + +"Derivative Works" shall mean any work, whether in Source or Object form, +that is based on (or derived from) the Work and for which the editorial +revisions, annotations, elaborations, or other modifications represent, as a +whole, an original work of authorship. For the purposes of this License, +Derivative Works shall not include works that remain separable from, or +merely link (or bind by name) to the interfaces of, the Work and Derivative +Works thereof. + +"Contribution" shall mean any work of authorship, including the original +version of the Work and any modifications or additions to that Work or +Derivative Works thereof, that is intentionally submitted to Licensor for +inclusion in the Work by the copyright owner or by an individual or Legal +Entity authorized to submit on behalf of the copyright owner. For the +purposes of this definition, "submitted" means any form of electronic, +verbal, or written communication sent to the Licensor or its +representatives, including but not limited to communication on electronic +mailing lists, source code control systems, and issue tracking systems that +are managed by, or on behalf of, the Licensor for the purpose of discussing +and improving the Work, but excluding communication that is conspicuously +marked or otherwise designated in writing by the copyright owner as "Not a +Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on +behalf of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this +License, each Contributor hereby grants to You a perpetual, worldwide, +non-exclusive, no-charge, royalty-free, irrevocable copyright license to +reproduce, prepare Derivative Works of, publicly display, publicly perform, +sublicense, and distribute the Work and such Derivative Works in Source or +Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this +License, each Contributor hereby grants to You a perpetual, worldwide, +non-exclusive, no-charge, royalty-free, irrevocable (except as stated in +this section) patent license to make, have made, use, offer to sell, sell, +import, and otherwise transfer the Work, where such license applies only to +those patent claims licensable by such Contributor that are necessarily +infringed by their Contribution(s) alone or by combination of their +Contribution(s) with the Work to which such Contribution(s) was submitted. +If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this +License for that Work shall terminate as of the date such litigation is +filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or +Derivative Works thereof in any medium, with or without modifications, and +in Source or Object form, provided that You meet the following conditions: + +a. You must give any other recipients of the Work or Derivative Works a copy +of this License; and + +b. You must cause any modified files to carry prominent notices stating that +You changed the files; and + +c. You must retain, in the Source form of any Derivative Works that You +distribute, all copyright, patent, trademark, and attribution notices from +the Source form of the Work, excluding those notices that do not pertain to +any part of the Derivative Works; and + +d. If the Work includes a "NOTICE" text file as part of its distribution, +then any Derivative Works that You distribute must include a readable copy +of the attribution notices contained within such NOTICE file, excluding +those notices that do not pertain to any part of the Derivative Works, in at +least one of the following places: within a NOTICE text file distributed as +part of the Derivative Works; within the Source form or documentation, if +provided along with the Derivative Works; or, within a display generated by +the Derivative Works, if and wherever such third-party notices normally +appear. The contents of the NOTICE file are for informational purposes only +and do not modify the License. You may add Your own attribution notices +within Derivative Works that You distribute, alongside or as an addendum to +the NOTICE text from the Work, provided that such additional attribution +notices cannot be construed as modifying the License. + +You may add Your own copyright statement to Your modifications and may +provide additional or different license terms and conditions for use, +reproduction, or distribution of Your modifications, or for any such +Derivative Works as a whole, provided Your use, reproduction, and +distribution of the Work otherwise complies with the conditions stated in +this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any +Contribution intentionally submitted for inclusion in the Work by You to the +Licensor shall be under the terms and conditions of this License, without +any additional terms or conditions. Notwithstanding the above, nothing +herein shall supersede or modify the terms of any separate license agreement +you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade +names, trademarks, service marks, or product names of the Licensor, except +as required for reasonable and customary use in describing the origin of the +Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in +writing, Licensor provides the Work (and each Contributor provides its +Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied, including, without limitation, any +warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or +FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining +the appropriateness of using or redistributing the Work and assume any risks +associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether +in tort (including negligence), contract, or otherwise, unless required by +applicable law (such as deliberate and grossly negligent acts) or agreed to +in writing, shall any Contributor be liable to You for damages, including +any direct, indirect, special, incidental, or consequential damages of any +character arising as a result of this License or out of the use or inability +to use the Work (including but not limited to damages for loss of goodwill, +work stoppage, computer failure or malfunction, or any and all other +commercial damages or losses), even if such Contributor has been advised of +the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work +or Derivative Works thereof, You may choose to offer, and charge a fee for, +acceptance of support, warranty, indemnity, or other liability obligations +and/or rights consistent with this License. However, in accepting such +obligations, You may act only on Your own behalf and on Your sole +responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any +liability incurred by, or claims asserted against, such Contributor by +reason of your accepting any such warranty or additional liability. + diff --git a/build/sh2ju.sh b/build/sh2ju.sh new file mode 100755 index 00000000..c020d490 --- /dev/null +++ b/build/sh2ju.sh @@ -0,0 +1,131 @@ +#!/bin/sh +### Copyright 2010 Manuel Carrasco Moñino. (manolo at apache.org) +### +### Licensed under the Apache License, Version 2.0. +### You may obtain a copy of it at +### http://www.apache.org/licenses/LICENSE-2.0 + +### +### A library for shell scripts which creates reports in jUnit format. +### These reports can be used in Jenkins, or any other CI. +### +### Usage: +### - Include this file in your shell script +### - Use juLog to call your command any time you want to produce a new report +### Usage: juLog command arguments +### options: +### -name="TestName" : the test name which will be shown in the junit report +### -error="RegExp" : a regexp which sets the test as failure when the output matches it +### -ierror="RegExp" : same as -error but case insensitive +### - Junit reports are left in the folder 'result' under the directory where the script is executed. +### - Configure Jenkins to parse junit files from the generated folder +### + +asserts=00; errors=0; total=0; content="" +date=`which gdate || which date` + +# create output folder +juDIR=`pwd`/results +mkdir -p "$juDIR" || exit + +# The name of the suite is calculated based in your script name +suite=`basename $0 | sed -e 's/.sh$//' | tr "." "_"` + +# A wrapper for the eval method witch allows catching seg-faults and use tee +errfile=/tmp/evErr.$$.log +eVal() { + eval "$1" + echo $? | tr -d "\n" >$errfile +} + +# Method to clean old tests +juLogClean() { + echo "+++ Removing old junit reports from: $juDIR " + rm -f "$juDIR"/TEST-* +} + +# Execute a command and record its results +juLog() { + + # parse arguments + ya=""; icase="" + while [ -z "$ya" ]; do + case "$1" in + -name=*) name=$asserts-`echo "$1" | sed -e 's/-name=//'`; shift;; + -ierror=*) ereg=`echo "$1" | sed -e 's/-ierror=//'`; icase="-i"; shift;; + -error=*) ereg=`echo "$1" | sed -e 's/-error=//'`; shift;; + *) ya=1;; + esac + done + + # use first arg as name if it was not given + if [ -z "$name" ]; then + name="$asserts-$1" + shift + fi + + # calculate command to eval + [ -z "$1" ] && return + cmd="$1"; shift + while [ -n "$1" ] + do + cmd="$cmd \"$1\"" + shift + done + + # eval the command sending output to a file + outf=/var/tmp/ju$$.txt + >$outf + echo "" | tee -a $outf + echo "+++ Running case: $name " | tee -a $outf + echo "+++ working dir: "`pwd` | tee -a $outf + echo "+++ command: $cmd" | tee -a $outf + ini=`$date +%s.%N` + eVal "$cmd" 2>&1 | tee -a $outf + evErr=`cat $errfile` + rm -f $errfile + end=`date +%s.%N` + echo "+++ exit code: $evErr" | tee -a $outf + + # set the appropriate error, based in the exit code and the regex + [ $evErr != 0 ] && err=1 || err=0 + out=`cat $outf | sed -e 's/^\([^+]\)/| \1/g'` + if [ $err = 0 -a -n "$ereg" ]; then + H=`echo "$out" | egrep $icase "$ereg"` + [ -n "$H" ] && err=1 + fi + echo "+++ error: $err" | tee -a $outf + rm -f $outf + + # calculate vars + asserts=`expr $asserts + 1` + asserts=`printf "%.2d" $asserts` + errors=`expr $errors + $err` + time=`echo "$end - $ini" | bc -l` + total=`echo "$total + $time" | bc -l` + + # write the junit xml report + ## failure tag + [ $err = 0 ] && failure="" || failure=" + + " + ## testcase tag + content="$content + + $failure + + + + + " + ## testsuite block + cat < "$juDIR/TEST-$suite.xml" + + $content + +EOF + +} + From b920402b1fddd2294e4bb4b9dc8eefdf4ecc4566 Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Mon, 13 Apr 2015 11:37:45 -0700 Subject: [PATCH 2/4] build: Create test scripts for basic code quality Test scripts run to ensure the programs will execute and report back into junit format for Jenkins reporting. These scripts can be run manually outside of the build system to check code prior to commiting. usrlocalbinshell requires that shellcheck be installed on the testing system. --- .gitignore | 3 + build/tests-prebuild.sh | 61 ++++++++++++++++++++ build/tests/prebuild/001-cgibinperl.sh | 52 +++++++++++++++++ build/tests/prebuild/002-usrlocalbinperl.sh | 53 +++++++++++++++++ build/tests/prebuild/003-usrlocalbinshell.sh | 61 ++++++++++++++++++++ 5 files changed, 230 insertions(+) create mode 100644 .gitignore create mode 100755 build/tests-prebuild.sh create mode 100755 build/tests/prebuild/001-cgibinperl.sh create mode 100755 build/tests/prebuild/002-usrlocalbinperl.sh create mode 100755 build/tests/prebuild/003-usrlocalbinshell.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..64f1f462 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ + +# Results of the testscripst +/results/ diff --git a/build/tests-prebuild.sh b/build/tests-prebuild.sh new file mode 100755 index 00000000..b0803e8a --- /dev/null +++ b/build/tests-prebuild.sh @@ -0,0 +1,61 @@ +#!/bin/sh +<<'LICENSE' + Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks + Copyright (C) 2015 Conrad Lara + See Contributors file for additional contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Additional Terms: + + Additional use restrictions exist on the AREDN(TM) trademark and logo. + See AREDNLicense.txt for more info. + + Attributions to the AREDN Project must be retained in the source code. + If importing this code into a new or existing project attribution + to the AREDN project must be added to the source code. + + You must not misrepresent the origin of the material conained within. + + Modified versions must be modified to attribute to the original source + and be marked in reasonable ways as differentiate it from the original + version. + +LICENSE + +PWD=$(pwd) +SCRIPTBASE=$(dirname "$(readlink -f "$0")") + +if [ "$1" != "" ] +then + AREDNFILESBASE=$1 +else + AREDNFILESBASE="$PWD/files" +fi + + +if [ ! -d "$AREDNFILESBASE" ] +then + echo "ERROR: $AREDNFILESBASE doesn't exist" + exit 1; +fi + +for file in $SCRIPTBASE/tests/prebuild/* +do + if [ -x "$file" ]; then + $file "$AREDNFILESBASE" + fi +done + +# Make sure we return clean as to not stop the BuildBot +exit 0 diff --git a/build/tests/prebuild/001-cgibinperl.sh b/build/tests/prebuild/001-cgibinperl.sh new file mode 100755 index 00000000..5e8f2ebf --- /dev/null +++ b/build/tests/prebuild/001-cgibinperl.sh @@ -0,0 +1,52 @@ +#!/bin/sh +<<'LICENSE' + Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks + Copyright (C) 2015 Conrad Lara + See Contributors file for additional contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Additional Terms: + + Additional use restrictions exist on the AREDN(TM) trademark and logo. + See AREDNLicense.txt for more info. + + Attributions to the AREDN Project must be retained in the source code. + If importing this code into a new or existing project attribution + to the AREDN project must be added to the source code. + + You must not misrepresent the origin of the material conained within. + + Modified versions must be modified to attribute to the original source + and be marked in reasonable ways as differentiate it from the original + version. + +LICENSE + +SCRIPTBASE=$(dirname "$(readlink -f "$0")") +. "$SCRIPTBASE/../../sh2ju.sh" + +AREDNFILESBASE=$1 + +if [ ! -d "$AREDNFILESBASE" ] +then + echo "ERROR: Please provide the files base path" + exit 1; +fi + + + +for file in "$AREDNFILESBASE"/www/cgi-bin/* +do + juLog -name="perlscript_$(basename "$file")" "perl -I $AREDNFILESBASE/www/cgi-bin -cw $file" +done diff --git a/build/tests/prebuild/002-usrlocalbinperl.sh b/build/tests/prebuild/002-usrlocalbinperl.sh new file mode 100755 index 00000000..a6dedf54 --- /dev/null +++ b/build/tests/prebuild/002-usrlocalbinperl.sh @@ -0,0 +1,53 @@ +#!/bin/sh +<<'LICENSE' + Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks + Copyright (C) 2015 Conrad Lara + See Contributors file for additional contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Additional Terms: + + Additional use restrictions exist on the AREDN(TM) trademark and logo. + See AREDNLicense.txt for more info. + + Attributions to the AREDN Project must be retained in the source code. + If importing this code into a new or existing project attribution + to the AREDN project must be added to the source code. + + You must not misrepresent the origin of the material conained within. + + Modified versions must be modified to attribute to the original source + and be marked in reasonable ways as differentiate it from the original + version. + +LICENSE + +SCRIPTBASE=$(dirname "$(readlink -f "$0")") +. "$SCRIPTBASE/../../sh2ju.sh" + +AREDNFILESBASE=$1 + +if [ ! -d "$AREDNFILESBASE" ] +then + echo "ERROR: Please provide the files base path" + exit 1; +fi + + +for file in "$AREDNFILESBASE"/usr/local/bin/* +do + if head -n 1 "$file" | grep perl >/dev/null; then + juLog -name="usrlocalbinperl_$(basename "$file")" "perl -I $AREDNFILESBASE/www/cgi-bin -cw $file" + fi +done diff --git a/build/tests/prebuild/003-usrlocalbinshell.sh b/build/tests/prebuild/003-usrlocalbinshell.sh new file mode 100755 index 00000000..7c2507f9 --- /dev/null +++ b/build/tests/prebuild/003-usrlocalbinshell.sh @@ -0,0 +1,61 @@ +#!/bin/sh +<<'LICENSE' + Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks + Copyright (C) 2015 Conrad Lara + See Contributors file for additional contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Additional Terms: + + Additional use restrictions exist on the AREDN(TM) trademark and logo. + See AREDNLicense.txt for more info. + + Attributions to the AREDN Project must be retained in the source code. + If importing this code into a new or existing project attribution + to the AREDN project must be added to the source code. + + You must not misrepresent the origin of the material conained within. + + Modified versions must be modified to attribute to the original source + and be marked in reasonable ways as differentiate it from the original + version. + +LICENSE + +SCRIPTBASE=$(dirname "$(readlink -f "$0")") +. "$SCRIPTBASE/../../sh2ju.sh" + +AREDNFILESBASE=$1 + +if [ ! -d "$AREDNFILESBASE" ] +then + echo "ERROR: Please provide the files base path" + exit 1; +fi + +# Make sure shellchheck is installed and in path. +juLog -name="usrlocalbinshell_shellcheckexists" which shellcheck +SHELLCHECKEXISTS=$? +echo $SHELLCHECKEXISTS +if [ "$SHELLCHECKEXISTS" = "1" ]; then + echo "Unable to find shellcheck, tests not run." + exit 1; +fi + +for file in "$AREDNFILESBASE"/usr/local/bin/* +do + if head -n 1 "$file" | grep "bin/sh" >/dev/null; then + juLog -name="usrlocalbinshell_$(basename "$file")" shellcheck "$file" + fi +done From 741bb65e4b985c5008c2b18b9b6f52db6a91396b Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Thu, 30 Apr 2015 10:41:04 -0700 Subject: [PATCH 3/4] Refactor pre-build test scripts to work with upcomming build scripts --- build/tests-prebuild.sh | 9 +++++---- build/tests/prebuild/001-cgibinperl.sh | 13 +------------ build/tests/prebuild/002-usrlocalbinperl.sh | 12 +----------- build/tests/prebuild/003-usrlocalbinshell.sh | 10 +--------- 4 files changed, 8 insertions(+), 36 deletions(-) diff --git a/build/tests-prebuild.sh b/build/tests-prebuild.sh index b0803e8a..e1c7f849 100755 --- a/build/tests-prebuild.sh +++ b/build/tests-prebuild.sh @@ -33,8 +33,7 @@ LICENSE -PWD=$(pwd) -SCRIPTBASE=$(dirname "$(readlink -f "$0")") +export SCRIPTBASE=$(dirname "$(readlink -f "$0")") if [ "$1" != "" ] then @@ -43,17 +42,19 @@ else AREDNFILESBASE="$PWD/files" fi - if [ ! -d "$AREDNFILESBASE" ] then echo "ERROR: $AREDNFILESBASE doesn't exist" exit 1; fi +export AREDNFILESBASE + + for file in $SCRIPTBASE/tests/prebuild/* do if [ -x "$file" ]; then - $file "$AREDNFILESBASE" + $file fi done diff --git a/build/tests/prebuild/001-cgibinperl.sh b/build/tests/prebuild/001-cgibinperl.sh index 5e8f2ebf..0623bbb3 100755 --- a/build/tests/prebuild/001-cgibinperl.sh +++ b/build/tests/prebuild/001-cgibinperl.sh @@ -33,18 +33,7 @@ LICENSE -SCRIPTBASE=$(dirname "$(readlink -f "$0")") -. "$SCRIPTBASE/../../sh2ju.sh" - -AREDNFILESBASE=$1 - -if [ ! -d "$AREDNFILESBASE" ] -then - echo "ERROR: Please provide the files base path" - exit 1; -fi - - +. "$SCRIPTBASE/sh2ju.sh" for file in "$AREDNFILESBASE"/www/cgi-bin/* do diff --git a/build/tests/prebuild/002-usrlocalbinperl.sh b/build/tests/prebuild/002-usrlocalbinperl.sh index a6dedf54..beeab501 100755 --- a/build/tests/prebuild/002-usrlocalbinperl.sh +++ b/build/tests/prebuild/002-usrlocalbinperl.sh @@ -33,17 +33,7 @@ LICENSE -SCRIPTBASE=$(dirname "$(readlink -f "$0")") -. "$SCRIPTBASE/../../sh2ju.sh" - -AREDNFILESBASE=$1 - -if [ ! -d "$AREDNFILESBASE" ] -then - echo "ERROR: Please provide the files base path" - exit 1; -fi - +. "$SCRIPTBASE/sh2ju.sh" for file in "$AREDNFILESBASE"/usr/local/bin/* do diff --git a/build/tests/prebuild/003-usrlocalbinshell.sh b/build/tests/prebuild/003-usrlocalbinshell.sh index 7c2507f9..c39c5689 100755 --- a/build/tests/prebuild/003-usrlocalbinshell.sh +++ b/build/tests/prebuild/003-usrlocalbinshell.sh @@ -33,16 +33,8 @@ LICENSE -SCRIPTBASE=$(dirname "$(readlink -f "$0")") -. "$SCRIPTBASE/../../sh2ju.sh" +. "$SCRIPTBASE/sh2ju.sh" -AREDNFILESBASE=$1 - -if [ ! -d "$AREDNFILESBASE" ] -then - echo "ERROR: Please provide the files base path" - exit 1; -fi # Make sure shellchheck is installed and in path. juLog -name="usrlocalbinshell_shellcheckexists" which shellcheck From 885e93b241cc62c4c483c972a81184f21e391a62 Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Sun, 3 May 2015 12:13:38 -0700 Subject: [PATCH 4/4] feature: Add scripts for generating images. These scripts are intended to be run by Jenkins. minimal/no error checking is done with these scripts at this time. Some ENV variables needs to be set before executing these scripts. --- build/buildsteps/001-prepbuild | 21 ++++++ build/buildsteps/002-makekconfig | 45 +++++++++++++ build/buildsteps/003-buildimage.sh | 35 ++++++++++ build/buildsteps/kconfig/001-architecture | 41 ++++++++++++ build/buildsteps/kconfig/002-ath9kregd | 39 +++++++++++ build/buildsteps/kconfig/003-packages | 82 +++++++++++++++++++++++ build/makeimage.sh | 67 ++++++++++++++++++ 7 files changed, 330 insertions(+) create mode 100755 build/buildsteps/001-prepbuild create mode 100755 build/buildsteps/002-makekconfig create mode 100755 build/buildsteps/003-buildimage.sh create mode 100755 build/buildsteps/kconfig/001-architecture create mode 100755 build/buildsteps/kconfig/002-ath9kregd create mode 100755 build/buildsteps/kconfig/003-packages create mode 100755 build/makeimage.sh diff --git a/build/buildsteps/001-prepbuild b/build/buildsteps/001-prepbuild new file mode 100755 index 00000000..83e328d6 --- /dev/null +++ b/build/buildsteps/001-prepbuild @@ -0,0 +1,21 @@ +#!/bin/sh + +cd "$BUILDROOTBASE" + +# Prep the feeds file +echo "src-git arednpackages git://git.aredn.org/aredn_packages;develop" > feeds.conf +cat feeds.conf.default >> feeds.conf +./scripts/feeds update -a +./scripts/feeds install -p arednpackages olsrd +./scripts/feeds install perl +./scripts/feeds install -p arednpackages vtun +./scripts/feeds install snmpd + +SHORT_COMMIT=$(echo "$GIT_COMMIT" | awk '{ string=substr($0, 1, 8); print string; }' ) +SHORT_BRANCH=$(echo "$GIT_BRANCH" | awk 'match($0,"/"){print substr($0,RSTART+1)}') + +if ( -z "$BUILD_SET_VERSION" ); then + echo "$BUILD_SET_VERSION" > "$BUILDROOTBASE/files/etc/mesh-release" +else + echo "${SHORT_BRANCH}-${BUILD_NUMBER}-${SHORT_COMMIT}" > "$BUILDROOTBASE/files/etc/mesh-release" +fi diff --git a/build/buildsteps/002-makekconfig b/build/buildsteps/002-makekconfig new file mode 100755 index 00000000..4580f5d5 --- /dev/null +++ b/build/buildsteps/002-makekconfig @@ -0,0 +1,45 @@ +#!/bin/sh +<<'LICENSE' + Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks + Copyright (C) 2015 Conrad Lara + See Contributors file for additional contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Additional Terms: + + Additional use restrictions exist on the AREDN(TM) trademark and logo. + See AREDNLicense.txt for more info. + + Attributions to the AREDN Project must be retained in the source code. + If importing this code into a new or existing project attribution + to the AREDN project must be added to the source code. + + You must not misrepresent the origin of the material conained within. + + Modified versions must be modified to attribute to the original source + and be marked in reasonable ways as differentiate it from the original + version. + +LICENSE + +. "$SCRIPTBASE/sh2ju.sh" + +rm "$BUILDROOTBASE/.config" 2> /dev/null + +touch "$BUILDROOTBASE/.config" + +for file in "$SCRIPTBASE"/buildsteps/kconfig/* +do + $file >> "$BUILDROOTBASE/.config" +done diff --git a/build/buildsteps/003-buildimage.sh b/build/buildsteps/003-buildimage.sh new file mode 100755 index 00000000..4dd3deb7 --- /dev/null +++ b/build/buildsteps/003-buildimage.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +cd "$BUILDROOTBASE" + + +make defconfig +# Tools Build +make IGNORE_ERRORS=m V=99 BUILD_LOG=1 tools/install -j3 +# toolchain build +make IGNORE_ERRORS=m V=99 BUILD_LOG=1 toolchain/install +#kernel compile +make IGNORE_ERRORS=m V=99 BUILD_LOG=1 target/compile -j3 +# package compile +make IGNORE_ERRORS=m V=99 BUILD_LOG=1 package/compile -j3 +#package installation +make IGNORE_ERRORS=m V=99 BUILD_LOG=1 package/install -j3 +#package index +make IGNORE_ERRORS=m V=99 BUILD_LOG=1 package/index +#image generation +make IGNORE_ERRORS=m V=99 BUILD_LOG=1 target/install -j3 + +# Cleanup for now until fix cleanup module +rm -Rf build_dir/* +rm -Rf staging_dir/* + +SHORT_COMMIT=$(echo "$GIT_COMMIT" | awk '{ string=substr($0, 1, 8); print string; }' ) +SHORT_BRANCH=$(echo "$GIT_BRANCH" | awk 'match($0,"/"){print substr($0,RSTART+1)}') + +if ( -z "$BUILD_SET_VERSION" ); then + MYBUILDNAME="$BUILD_SET_VERSION" +else + MYBUILDNAME="${SHORT_BRANCH}-${BUILD_NUMBER}-${SHORT_COMMIT}" +fi +rename "s/openwrt/AREDN-$MYBUILDNAME/g" bin/ar71xx/* + diff --git a/build/buildsteps/kconfig/001-architecture b/build/buildsteps/kconfig/001-architecture new file mode 100755 index 00000000..37e8369e --- /dev/null +++ b/build/buildsteps/kconfig/001-architecture @@ -0,0 +1,41 @@ +#!/bin/sh +<<'LICENSE' + Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks + Copyright (C) 2015 Conrad Lara + See Contributors file for additional contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Additional Terms: + + Additional use restrictions exist on the AREDN(TM) trademark and logo. + See AREDNLicense.txt for more info. + + Attributions to the AREDN Project must be retained in the source code. + If importing this code into a new or existing project attribution + to the AREDN project must be added to the source code. + + You must not misrepresent the origin of the material conained within. + + Modified versions must be modified to attribute to the original source + and be marked in reasonable ways as differentiate it from the original + version. + +LICENSE + +# For now lets just return static entries +cat << EOF +CONFIG_TARGET_ar71xx=y +CONFIG_TARGET_ar71xx_Default=y +CONFIG_ARCH=mips +EOF diff --git a/build/buildsteps/kconfig/002-ath9kregd b/build/buildsteps/kconfig/002-ath9kregd new file mode 100755 index 00000000..ec344fe0 --- /dev/null +++ b/build/buildsteps/kconfig/002-ath9kregd @@ -0,0 +1,39 @@ +#!/bin/sh +<<'LICENSE' + Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks + Copyright (C) 2015 Conrad Lara + See Contributors file for additional contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Additional Terms: + + Additional use restrictions exist on the AREDN(TM) trademark and logo. + See AREDNLicense.txt for more info. + + Attributions to the AREDN Project must be retained in the source code. + If importing this code into a new or existing project attribution + to the AREDN project must be added to the source code. + + You must not misrepresent the origin of the material conained within. + + Modified versions must be modified to attribute to the original source + and be marked in reasonable ways as differentiate it from the original + version. + +LICENSE + +# For now lets just return static entries +cat << EOF +CONFIG_ATH_USER_REGD=y +EOF diff --git a/build/buildsteps/kconfig/003-packages b/build/buildsteps/kconfig/003-packages new file mode 100755 index 00000000..b44eab50 --- /dev/null +++ b/build/buildsteps/kconfig/003-packages @@ -0,0 +1,82 @@ +#!/bin/sh +<<'LICENSE' + Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks + Copyright (C) 2015 Conrad Lara + See Contributors file for additional contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Additional Terms: + + Additional use restrictions exist on the AREDN(TM) trademark and logo. + See AREDNLicense.txt for more info. + + Attributions to the AREDN Project must be retained in the source code. + If importing this code into a new or existing project attribution + to the AREDN project must be added to the source code. + + You must not misrepresent the origin of the material conained within. + + Modified versions must be modified to attribute to the original source + and be marked in reasonable ways as differentiate it from the original + version. + +LICENSE + +# For now lets just return static entries + +# Kernel Config entries for packages that should be a part of the build +cat <<'EOF' +CONFIG_ALL=y +CONFIG_PACKAGE_bridge=y +CONFIG_PACKAGE_busybox=y +CONFIG_PACKAGE_dnsmasq=y +CONFIG_PACKAGE_dropbear=y +CONFIG_PACKAGE_iptables=y +CONFIG_PACKAGE_kmod-ipt-nathelper=y +CONFIG_PACKAGE_kmod-usb-core=y +CONFIG_PACKAGE_kmod-usb-uhci=y +CONFIG_PACKAGE_kmod-usb2=y +CONFIG_PACKAGE_libgcc=y +CONFIG_PACKAGE_mtd=y +CONFIG_PACKAGE_ppp=y +CONFIG_PACKAGE_ppp-mod-pppoe=y +CONFIG_PACKAGE_uhttpd=y +CONFIG_PACKAGE_olsrd=y +CONFIG_PACKAGE_perl=y +CONFIG_PACKAGE_olsrd-mod-arprefresh=y +CONFIG_PACKAGE_olsrd-mod-dyn-gw=y +CONFIG_PACKAGE_olsrd-mod-httpinfo=y +CONFIG_PACKAGE_olsrd-mod-nameservice=y +CONFIG_PACKAGE_olsrd-mod-txtinfo=y +CONFIG_PACKAGE_olsrd-mod-dot-draw=y +CONFIG_PACKAGE_olsrd-mod-watchdog=y +CONFIG_PACKAGE_olsrd-mod-secure=y +CONFIG_PACKAGE_perlbase-essential=y +CONFIG_PACKAGE_perlbase-xsloader=y +CONFIG_PACKAGE_perlbase-file=y +CONFIG_PACKAGE_perlbase-perlio=y +CONFIG_PACKAGE_libpcap=y +CONFIG_PACKAGE_tcpdump-mini=y +CONFIG_PACKAGE_ntpclient=y +CONFIG_PACKAGE_xinetd=y +CONFIG_PACKAGE_kmod-ipv6=y +CONFIG_PACKAGE_ip6tables=y +CONFIG_PACKAGE_kmod-ip6tables=y +CONFIG_PACKAGE_libip6tc=y +CONFIG_PACKAGE_ip=y +CONFIG_PACKAGE_iptables-mod-ipopt=y +CONFIG_PACKAGE_iwinfo=y +CONFIG_PACKAGE_libiwinfo=y +CONFIG_PACKAGE_socat=y +EOF diff --git a/build/makeimage.sh b/build/makeimage.sh new file mode 100755 index 00000000..71084dc3 --- /dev/null +++ b/build/makeimage.sh @@ -0,0 +1,67 @@ +#!/bin/sh +<<'LICENSE' + Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks + Copyright (C) 2015 Conrad Lara + See Contributors file for additional contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Additional Terms: + + Additional use restrictions exist on the AREDN(TM) trademark and logo. + See AREDNLicense.txt for more info. + + Attributions to the AREDN Project must be retained in the source code. + If importing this code into a new or existing project attribution + to the AREDN project must be added to the source code. + + You must not misrepresent the origin of the material conained within. + + Modified versions must be modified to attribute to the original source + and be marked in reasonable ways as differentiate it from the original + version. + +LICENSE + +SCRIPTBASE=$(dirname "$(readlink -f "$0")") +export SCRIPTBASE + +if [ "$1" != "" ] +then + BUILDROOTBASE=$1 +else + BUILDROOTBASE="$PWD" +fi + +export BUILDROOTBASE + +if [ ! -d "$BUILDROOTBASE" ] +then + + echo "ERROR: $BUILDROOTBASE doesn't exist" + exit 1; +fi + +# Run pre-tests +"$SCRIPTBASE"/tests-prebuild.sh "${BUILDROOTBASE}/files" + +for file in $SCRIPTBASE/buildsteps/* +do + if ( [ -x "$file" ] && [ -f "$file" ] ); then + echo "BUILDSTEP: $file" + $file + fi +done + + +exit 0