From 390e9cb97cd71f601686a12ac6501204e5404bbf Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Mon, 7 Oct 2019 13:27:38 -0700 Subject: [PATCH 1/4] Bug#255: SOL006 Jenkins build is broken --- example-data/nfv-nsd.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/example-data/nfv-nsd.xml b/example-data/nfv-nsd.xml index cc2c70a..f3395da 100644 --- a/example-data/nfv-nsd.xml +++ b/example-data/nfv-nsd.xml @@ -1,4 +1,5 @@ - + + ASA My Company @@ -11,15 +12,15 @@ Firewall VDU inside - nfv:ethernet + nfv:ethernet management - nfv:ethernet + nfv:ethernet outside - nfv:ethernet + nfv:ethernet asa-vcd asa-vsd @@ -36,7 +37,7 @@ asa-vsd - nfv:root-storage + nfv:root-storage 0 @@ -133,4 +134,4 @@ - + -- GitLab From 104ab615b5f49a294ba3fb35b4dc25e86cdc106e Mon Sep 17 00:00:00 2001 From: Michele Carignani Date: Fri, 2 Aug 2019 13:26:31 +0200 Subject: [PATCH 2/4] Update LICENSE Deleted COPYRIGHT --- COPYRIGHT | 15 --------------- LICENSE | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 15 deletions(-) delete mode 100644 COPYRIGHT create mode 100644 LICENSE diff --git a/COPYRIGHT b/COPYRIGHT deleted file mode 100644 index 9c52881..0000000 --- a/COPYRIGHT +++ /dev/null @@ -1,15 +0,0 @@ -ETSI FORGE COPYRIGHT STATEMENT - -Copyright (c) ETSI 2018. - -This software is subject to copyrights owned by ETSI. Non-exclusive permission -is hereby granted, free of charge, to copy, reproduce and amend this file -under the following conditions: It is provided "as is", without warranty of any -kind, expressed or implied. - -ETSI shall never be liable for any claim, damages, or other liability arising -from its use or inability of use.This permission does not apply to any documentation -associated with this file for which ETSI keeps all rights reserved. The present -copyright notice shall be included in all copies of whole or part of this -software and shall not imply any sub-license right. - diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..4436d6d --- /dev/null +++ b/LICENSE @@ -0,0 +1,23 @@ +Copyright 2019 ETSI + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +3. Neither the name of the copyright holder nor the names of its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file -- GitLab From 37cb7341f2548f06ffd3743fe4ef8019c465d0f3 Mon Sep 17 00:00:00 2001 From: Michele Carignani Date: Mon, 14 Oct 2019 18:08:27 +0200 Subject: [PATCH 3/4] fail the build only if the compilation fails, remove etsi-nfv-yang from inputs of pyang --- .jenkins.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.jenkins.sh b/.jenkins.sh index 428f508..7b00710 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -16,16 +16,18 @@ CMT=$(git rev-parse --short HEAD) docker build --tag "$IMG" . docker run "$IMG" +verdict=$? + echo "Building HTML tree" docker run -v"$(pwd)/src/yang/:/yang/" mjethanandani/pyang \ "/bin/sh" -c "cd /yang/ && pyang -f jstree -p /yang/ \ - /yang/etsi-nfv.yang > etsi-nfv.html" + /yang/*.yang > etsi-nfv.html" sed -r -i 's|||g' src/yang/etsi-nfv.html sed -r -i 's|data\:image/gif\;base64,R0lGODlhS.*RCAA7|https://www.etsi.org/images/ETSILogoTwitter.png\" height=\"100|g' src/yang/etsi-nfv.html -sed -r -i "s|
|

Commit: $CMT, Build:$BUILD_NUMBER

|g" src/yang/etsi-nfv.html +sed -r -i "s|
|

Commit: $CMT, Build:$BUILD_NUMBER

|g" src/yang/etsi-nfv.html -exit $? +exit $verdict -- GitLab From 6e7ecf9101e6eaab945b289b5b8cf368ca2d3069 Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Mon, 14 Oct 2019 15:00:52 -0700 Subject: [PATCH 4/4] Fix the jenkins file to only generate tree from one file. --- .jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jenkins.sh b/.jenkins.sh index 7b00710..bd654b4 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -21,7 +21,7 @@ verdict=$? echo "Building HTML tree" docker run -v"$(pwd)/src/yang/:/yang/" mjethanandani/pyang \ "/bin/sh" -c "cd /yang/ && pyang -f jstree -p /yang/ \ - /yang/*.yang > etsi-nfv.html" + /yang/etsi-nfv-descriptors.yang > etsi-nfv.html" sed -r -i 's|||g' src/yang/etsi-nfv.html sed -r -i 's|data\:image/gif\;base64,R0lGODlhS.*RCAA7|https://www.etsi.org/images/ETSILogoTwitter.png\" height=\"100|g' src/yang/etsi-nfv.html -- GitLab