Merge branch 'jenkins' into 'master'

Jenkins See merge request !14
2017-07-11 19:20:12 +02:00
parent d9a2c491f1 692569d700
commit 355409a1c9
16 changed files with 35 additions and 20 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5556fd1ec6fdd8d">5556fd1ec6fdd8d</a> Jenkins Server <i>2017-07-11 17:12:52</i>
+<p>
+<h3>recommit for updates in build 17</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/08da1c5e7004f15">08da1c5e7004f15</a> Arne Teuke <i>2017-07-11 17:12:23</i>
+<p>
+<h3>finalised this stage</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/c1963582f006a9d">c1963582f006a9d</a> Jenkins Server <i>2017-07-11 17:08:47</i>
 <p>
 <h3>recommit for updates in build 16</h3>
--- a/10
+++ b/10
@@ -58,7 +58,9 @@ pipeline {

      stage('update repo structure') {
        steps {
-          sh '''rm -Rf REPOSTRUCTURE.md
+          sh '''if [ test -f REPOSTRUCTURE.md ]; then
+                rm -Rf REPOSTRUCTURE.md
+                fi
                echo "$(tree --dirsfirst --charset=ascii .)" > REPOSTRUCTURE.md'''
        }
      }
@@ -183,10 +185,12 @@ Changelog of Git Changelog.

      stage('check for UTF-8 files') {
        steps {
-          sh '''if [ ! -d test ]; then
-                mkdir test
+          sh '''if [ ! -d tests ]; then
+                mkdir tests
                fi
+                if [ -f tests/UTF_Files ]; then
                rm -Rf tests/UTF_Files
+                fi
                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.5 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache)](https://jenkins.confdroid.com/job/cd_apache/)|
+|`cd_apache`| 0.0.1.7 | [![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/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -51,6 +51,7 @@
 |-- Gemfile.lock
 |-- Jenkinsfile
 |-- LICENSE
-`-- README.md
+|-- README.md
+`-- REPOSTRUCTURE.md

-10 directories, 43 files
+10 directories, 44 files
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -137,7 +137,7 @@
 </div>

      <div id="footer">
-  Generated on Tue Jul 11 19:12:48 2017 by
+  Generated on Tue Jul 11 19:27:19 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.5 | <a
+|<code>cd_apache</code>| 0.0.1.7 | <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:12:49 2017 by
+  Generated on Tue Jul 11 19:27:20 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.5 | <a
+|<code>cd_apache</code>| 0.0.1.7 | <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:12:49 2017 by
+  Generated on Tue Jul 11 19:27:19 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:12:50 2017 by
+  Generated on Tue Jul 11 19:27:20 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:12:50 2017 by
+  Generated on Tue Jul 11 19:27:20 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:12:50 2017 by
+  Generated on Tue Jul 11 19:27:20 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:12:50 2017 by
+  Generated on Tue Jul 11 19:27:21 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:12:50 2017 by
+  Generated on Tue Jul 11 19:27:21 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:12:50 2017 by
+  Generated on Tue Jul 11 19:27:21 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:12:50 2017 by
+  Generated on Tue Jul 11 19:27:21 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:12:50 2017 by
+  Generated on Tue Jul 11 19:27:21 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:12:49 2017 by
+  Generated on Tue Jul 11 19:27:20 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>