From 41d7e53e3ed5df9dca1a7e1cd9099a7c78ae0c8f Mon Sep 17 00:00:00 2001
From: Michele Carignani <michele.carignani@etsi.org>
Date: Wed, 20 Feb 2019 17:12:01 +0800
Subject: [PATCH 1/5] restoring html build with an additional docker run
 command

---
 .jenkins.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.jenkins.sh b/.jenkins.sh
index 2292aca..552f336 100644
--- a/.jenkins.sh
+++ b/.jenkins.sh
@@ -14,5 +14,7 @@ IMG="$IMG_NAME:$VERSION"
 docker build --tag "$IMG" .
 docker run "$IMG"
 
+docker run -v"src/yang:/yang" mjethanandani/pyang "/bin/sh" -c "pyang -f jstree /yang/*" > "etsi-nfv.html"
+
 exit $?
 
-- 
GitLab


From 1e00418ad50efd779d1f947792008b6a28a544ee Mon Sep 17 00:00:00 2001
From: Mahesh Jethanandani <mjethanandani@gmail.com>
Date: Tue, 26 Feb 2019 16:58:38 -0800
Subject: [PATCH 2/5] Fixed the build for tree diagram

---
 .jenkins.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.jenkins.sh b/.jenkins.sh
index 552f336..a0770f6 100644
--- a/.jenkins.sh
+++ b/.jenkins.sh
@@ -14,6 +14,7 @@ IMG="$IMG_NAME:$VERSION"
 docker build --tag "$IMG" .
 docker run "$IMG"
 
+echo "Building HTML tree"
 docker run -v"src/yang:/yang" mjethanandani/pyang "/bin/sh" -c "pyang -f jstree /yang/*" > "etsi-nfv.html"
 
 exit $?
-- 
GitLab


From 2a39fa365b516e421066bd1089353beaca751d2d Mon Sep 17 00:00:00 2001
From: Michele Carignani <michele.carignani@etsi.org>
Date: Thu, 28 Feb 2019 16:07:02 +0100
Subject: [PATCH 3/5] fix relative path issue with Docker mount

---
 .jenkins.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.jenkins.sh b/.jenkins.sh
index a0770f6..f91a83a 100644
--- a/.jenkins.sh
+++ b/.jenkins.sh
@@ -15,7 +15,7 @@ docker build --tag "$IMG" .
 docker run "$IMG"
 
 echo "Building HTML tree"
-docker run -v"src/yang:/yang" mjethanandani/pyang "/bin/sh" -c "pyang -f jstree /yang/*" > "etsi-nfv.html"
+docker run -v"$(pwd)/src/yang:/yang/" mjethanandani/pyang "/bin/sh" -c "pyang -f jstree /yang/*" > "etsi-nfv.html"
 
 exit $?
 
-- 
GitLab


From 09895c4db4184f87017d7dce0d7de50f9868081a Mon Sep 17 00:00:00 2001
From: Michele Carignani <michele.carignani@etsi.org>
Date: Thu, 28 Feb 2019 17:44:58 +0100
Subject: [PATCH 4/5] fixed order of pyang arguments and improved header with
 logo, commit, build

---
 .jenkins.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.jenkins.sh b/.jenkins.sh
index f91a83a..3d9f8c0 100644
--- a/.jenkins.sh
+++ b/.jenkins.sh
@@ -11,11 +11,23 @@ IMG_NAME="sol006"
 VERSION=latest
 IMG="$IMG_NAME:$VERSION"
 
+CMT=$(git rev-parse --short HEAD)
+
 docker build --tag "$IMG" .
 docker run "$IMG"
 
 echo "Building HTML tree"
-docker run -v"$(pwd)/src/yang:/yang/" mjethanandani/pyang "/bin/sh" -c "pyang -f jstree /yang/*" > "etsi-nfv.html"
+docker run -v"$(pwd)/src/yang/:/yang/" mjethanandani/pyang \
+	"/bin/sh" -c "cd /yang/ && pyang -f jstree \
+	/yang/etsi-nfv-vnf.yang /yang/etsi-nfv-common.yang \
+	/yang/etsi-nfv-pnf.yang  /yang/etsi-nfv-ns.yang  /yang/etsi-nfv.yang \
+	> etsi-nfv.html"
+
+sed -r -i 's|<a href=\"http://www.tail-f.com">|<a href="http://etsi.org">|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|<div class=\"app\">|<p>Commit: <a href=\"https://forge.etsi.org/gitlab/nfv/SOL006/commit/${CMT}\">$CMT</a>, Build:<a href\"$BUILD_URL\">$BUILD_NUMBER<a/></p><div class=\"app\">|g" src/yang/etsi-nfv.html
+
 
 exit $?
 
-- 
GitLab


From c1a6400e0d0786a003a574ccf00ad3b016b10ad8 Mon Sep 17 00:00:00 2001
From: Michele Carignani <michele.carignani@etsi.org>
Date: Fri, 1 Mar 2019 15:38:29 +0100
Subject: [PATCH 5/5] simplify pyang arguments and fix build url

---
 .jenkins.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.jenkins.sh b/.jenkins.sh
index 3d9f8c0..428f508 100644
--- a/.jenkins.sh
+++ b/.jenkins.sh
@@ -18,15 +18,13 @@ docker run "$IMG"
 
 echo "Building HTML tree"
 docker run -v"$(pwd)/src/yang/:/yang/" mjethanandani/pyang \
-	"/bin/sh" -c "cd /yang/ && pyang -f jstree \
-	/yang/etsi-nfv-vnf.yang /yang/etsi-nfv-common.yang \
-	/yang/etsi-nfv-pnf.yang  /yang/etsi-nfv-ns.yang  /yang/etsi-nfv.yang \
-	> etsi-nfv.html"
+	"/bin/sh" -c "cd /yang/ && pyang -f jstree -p /yang/ \
+	/yang/etsi-nfv.yang > etsi-nfv.html"
 
 sed -r -i 's|<a href=\"http://www.tail-f.com">|<a href="http://etsi.org">|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|<div class=\"app\">|<p>Commit: <a href=\"https://forge.etsi.org/gitlab/nfv/SOL006/commit/${CMT}\">$CMT</a>, Build:<a href\"$BUILD_URL\">$BUILD_NUMBER<a/></p><div class=\"app\">|g" src/yang/etsi-nfv.html
+sed -r -i "s|<div class=\"app\">|<p>Commit: <a href=\"https://forge.etsi.org/gitlab/nfv/SOL006/commit/${CMT}\">$CMT</a>, Build:<a href=\"$BUILD_URL\">$BUILD_NUMBER</a></p><div class=\"app\">|g" src/yang/etsi-nfv.html
 
 
 exit $?
-- 
GitLab