Merge branch 'jenkins' into 'master'

Jenkins See merge request !12
2017-07-11 19:01:30 +02:00
parent 6a67c02f3c c1963582f0
commit 9589be79c6
16 changed files with 71 additions and 48 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,31 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/f1988c6272ba4a6">f1988c6272ba4a6</a> Jenkins Server <i>2017-07-11 17:01:52</i>
+<p>
+<h3>recommit for updates in build 14</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/834532297866d17">834532297866d17</a> Arne Teuke <i>2017-07-11 17:01:19</i>
+<p>
+<h3>added one more step</h3>
+
+</p>
+
+<h2> v0.0.1.4 </h2>
+<h2> No issue </h2>
+
+
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/114dd0f0b58ec6a">114dd0f0b58ec6a</a> Arne Teuke <i>2017-07-11 16:57:22</i>
+<p>
+<h3>removed stale FileList</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/7ba28eca8e1bd88">7ba28eca8e1bd88</a> Arne Teuke <i>2017-07-11 16:56:04</i>
+<p>
+<h3>updated README and version</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/3764f0bef1450d2">3764f0bef1450d2</a> Jenkins Server <i>2017-07-11 16:53:37</i>
 <p>
 <h3>recommit for updates in build 12</h3>
@@ -32,6 +57,31 @@ Changelog of Git Changelog.
 <p>
 <h3>recommit for updates in build 9</h3>

+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/36dc5918e52df38">36dc5918e52df38</a> Jenkins Server <i>2017-07-07 16:41:30</i>
+<p>
+<h3>recommit for updates in build 4</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/3715b3a582a1a5a">3715b3a582a1a5a</a> Arne Teuke <i>2017-07-07 16:40:31</i>
+<p>
+<h3>updated README</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/871d6e65baf4ec4">871d6e65baf4ec4</a> Jenkins Server <i>2017-07-07 16:38:35</i>
+<p>
+<h3>recommit for updates in build 3</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a88ed09f423fbb7">a88ed09f423fbb7</a> Arne Teuke <i>2017-07-07 16:38:00</i>
+<p>
+<h3>updated README</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/e13154f0117c337">e13154f0117c337</a> Jenkins Server <i>2017-07-07 15:22:20</i>
+<p>
+<h3>recommit for updates in build 2</h3>
+
 </p>

 <h2> v0.0.1.3 </h2>
@@ -87,31 +137,6 @@ Changelog of Git Changelog.
 <p>
 <h3>updated README</h3>

-</p>
-<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/36dc5918e52df38">36dc5918e52df38</a> Jenkins Server <i>2017-07-07 16:41:30</i>
-<p>
-<h3>recommit for updates in build 4</h3>
-
-</p>
-<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/3715b3a582a1a5a">3715b3a582a1a5a</a> Arne Teuke <i>2017-07-07 16:40:31</i>
-<p>
-<h3>updated README</h3>
-
-</p>
-<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/871d6e65baf4ec4">871d6e65baf4ec4</a> Jenkins Server <i>2017-07-07 16:38:35</i>
-<p>
-<h3>recommit for updates in build 3</h3>
-
-</p>
-<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a88ed09f423fbb7">a88ed09f423fbb7</a> Arne Teuke <i>2017-07-07 16:38:00</i>
-<p>
-<h3>updated README</h3>
-
-</p>
-<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/e13154f0117c337">e13154f0117c337</a> Jenkins Server <i>2017-07-07 15:22:20</i>
-<p>
-<h3>recommit for updates in build 2</h3>
-
 </p>

 <h2> v0.0.1.0 </h2>
--- a/7
+++ b/7
@@ -183,8 +183,11 @@ Changelog of Git Changelog.

      stage('check for UTF-8 files') {
        steps {
-          sh '''rm -Rf tests/UTF_Files
-                echo "$(find . -type f -exec file {} \\;)" > FileList
+          sh '''if [ ! -d test ]; then
+                mkdir test
+                fi
+                rm -Rf tests/UTF_Files
+                echo "$(find . -type f -exec file {} \\\\;)" > FileList
                echo  "$(grep -v ASCII FileList | grep -v git)" > tests/UTF_Files'''
        }
      }
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 |Repo Name| version | Build Status|
 |---|---|---|---|
-|`cd_apache`| 0.0.1.4 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache)](https://jenkins.confdroid.com/job/cd_apache/)|
+|`cd_apache`| 0.0.1.5 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache)](https://jenkins.confdroid.com/job/cd_apache/)|

 ### Synopsis
 `Apache httpd` is a very powerful and widely used web server.
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -137,7 +137,7 @@
 </div>

      <div id="footer">
-  Generated on Tue Jul 11 19:01:48 2017 by
+  Generated on Tue Jul 11 19:08:44 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -61,7 +61,7 @@
 <p>|Repo Name| version | Build
 Status|
 |---|---|---|---|
-|<code>cd_apache</code>| 0.0.1.4 | <a
+|<code>cd_apache</code>| 0.0.1.5 | <a
 href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache">{Build
 Status</a>/]|</p>

@@ -279,7 +279,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Tue Jul 11 19:01:49 2017 by
+  Generated on Tue Jul 11 19:08:45 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/index.html
+++ b/doc/index.html
@@ -61,7 +61,7 @@
 <p>|Repo Name| version | Build
 Status|
 |---|---|---|---|
-|<code>cd_apache</code>| 0.0.1.4 | <a
+|<code>cd_apache</code>| 0.0.1.5 | <a
 href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache">{Build
 Status</a>/]|</p>

@@ -279,7 +279,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Tue Jul 11 19:01:48 2017 by
+  Generated on Tue Jul 11 19:08:44 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache.html
+++ b/doc/puppet_classes/cd_apache.html
@@ -140,7 +140,7 @@ class cd_apache {
 </div>

      <div id="footer">
-  Generated on Tue Jul 11 19:01:49 2017 by
+  Generated on Tue Jul 11 19:08:45 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html
@@ -153,7 +153,7 @@ class cd_apache::main::config (
 </div>

      <div id="footer">
-  Generated on Tue Jul 11 19:01:49 2017 by
+  Generated on Tue Jul 11 19:08:45 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aparams.html
@@ -525,7 +525,7 @@ $ae_userdir_erb     = &#39;cd_apache/userdir_conf.erb&#39;
 </div>

      <div id="footer">
-  Generated on Tue Jul 11 19:01:49 2017 by
+  Generated on Tue Jul 11 19:08:45 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html
@@ -528,7 +528,7 @@ class cd_apache::server::dirs (
 </div>

      <div id="footer">
-  Generated on Tue Jul 11 19:01:49 2017 by
+  Generated on Tue Jul 11 19:08:45 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html
@@ -323,7 +323,7 @@ class cd_apache::server::files (
 </div>

      <div id="footer">
-  Generated on Tue Jul 11 19:01:49 2017 by
+  Generated on Tue Jul 11 19:08:46 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html
@@ -159,7 +159,7 @@ class cd_apache::server::install (
 </div>

      <div id="footer">
-  Generated on Tue Jul 11 19:01:50 2017 by
+  Generated on Tue Jul 11 19:08:46 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html
@@ -165,7 +165,7 @@ class cd_apache::server::service (
 </div>

      <div id="footer">
-  Generated on Tue Jul 11 19:01:50 2017 by
+  Generated on Tue Jul 11 19:08:46 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html
+++ b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html
@@ -209,7 +209,7 @@ class cd_apache::server::user (
 </div>

      <div id="footer">
-  Generated on Tue Jul 11 19:01:49 2017 by
+  Generated on Tue Jul 11 19:08:45 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 </div>

      <div id="footer">
-  Generated on Tue Jul 11 19:01:49 2017 by
+  Generated on Tue Jul 11 19:08:45 2017 by
  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/tests/UTF_Files
+++ b/tests/UTF_Files
@@ -1,6 +1 @@
-./.yardoc/object_types: data
-./.yardoc/proxy_types: Applesoft BASIC program data
-./.yardoc/complete: empty
-./.yardoc/objects/root.dat: data
-./doc/css/style.css: HTML document, UTF-8 Unicode text, with very long lines
-./doc/js/jquery.js: HTML document, UTF-8 Unicode text, with very long lines
+