Merge branch 'jenkins' into 'master'

Jenkins See merge request !11
2017-07-11 18:59:27 +02:00
parent 1183def439 f1988c6272
commit 6a67c02f3c
17 changed files with 34 additions and 105 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/3764f0bef1450d2">3764f0bef1450d2</a> Jenkins Server <i>2017-07-11 16:53:37</i>
+<p>
+<h3>recommit for updates in build 12</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/c9a26ad0546881e">c9a26ad0546881e</a> Arne Teuke <i>2017-07-11 16:53:03</i>
+<p>
+<h3>enhanced test to keep a permanent list of UTF files in tests/UTF_Files</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a1b2032baaaf745">a1b2032baaaf745</a> Jenkins Server <i>2017-07-11 16:32:16</i>
 <p>
 <h3>recommit for updates in build 11</h3>
--- a/82
+++ b/82
@@ -1,82 +0,0 @@
-./CHANGELOG.md: HTML document, ASCII text
-./README.md: ASCII text, with very long lines
-./REPOSTRUCTURE.md: ASCII text
-./examples/vhost.erb: ASCII text
-./examples/vhost_ssl.erb: ASCII text
-./Jenkinsfile: Python script, ASCII text executable, with very long lines
-./.gitignore: ASCII text
-./LICENSE: ASCII text, with very long lines
-./Gemfile.lock: ASCII text
-./.yardoc/checksums: ASCII text
-./.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/css/common.css: ASCII text
-./doc/css/full_list.css: ASCII text, with very long lines
-./doc/index.html: C++ source, ASCII text
-./doc/top-level-namespace.html: HTML document, ASCII text
-./doc/js/full_list.js: ASCII text
-./doc/js/app.js: HTML document, ASCII text
-./doc/js/jquery.js: HTML document, UTF-8 Unicode text, with very long lines
-./doc/puppet_class_list.html: HTML document, ASCII text
-./doc/puppet_classes/cd_apache.html: C++ source, ASCII text
-./doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html: C++ source, ASCII text
-./doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html: C++ source, ASCII text
-./doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html: C++ source, ASCII text
-./doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html: C++ source, ASCII text
-./doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html: C++ source, ASCII text
-./doc/puppet_classes/cd_apache_3A_3Aparams.html: HTML document, ASCII text
-./doc/puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html: C++ source, ASCII text
-./doc/frames.html: HTML document, ASCII text
-./doc/file.README.html: C++ source, ASCII text
-./doc/_index.html: HTML document, ASCII text
-./Gemfile: ASCII text
-./templates/httpd_conf.erb: ASCII text
-./templates/autoindex_conf.erb: ASCII text
-./templates/magic.erb: ASCII text
-./templates/userdir_conf.erb: ASCII text
-./templates/welcome.conf: ASCII text
-./templates/ssl_conf.erb: ASCII text
-./.git/FETCH_HEAD: ASCII text
-./.git/index: Git index, version 2, 44 entries
-./.git/logs/refs/remotes/origin/development: ASCII text
-./.git/logs/refs/remotes/origin/master: ASCII text
-./.git/logs/refs/heads/jenkins: ASCII text
-./.git/logs/HEAD: ASCII text
-./.git/hooks/applypatch-msg.sample: POSIX shell script, ASCII text executable
-./.git/hooks/pre-applypatch.sample: POSIX shell script, ASCII text executable
-./.git/hooks/pre-push.sample: POSIX shell script, ASCII text executable
-./.git/hooks/pre-commit.sample: POSIX shell script, ASCII text executable
-./.git/hooks/update.sample: POSIX shell script, ASCII text executable
-./.git/hooks/pre-rebase.sample: POSIX shell script, ASCII text executable
-./.git/hooks/post-update.sample: POSIX shell script, ASCII text executable
-./.git/hooks/prepare-commit-msg.sample: POSIX shell script, ASCII text executable
-./.git/hooks/commit-msg.sample: POSIX shell script, ASCII text executable
-./.git/ORIG_HEAD: ASCII text
-./.git/description: ASCII text
-./.git/info/exclude: ASCII text
-./.git/objects/89/ffb153dc556486a6e605f1742adf91bca4e70d: VAX COFF executable not stripped - version 20753
-./.git/objects/pack/pack-48ea62c13417ef03711351f8e923aa73c97bad79.pack: Git pack, version 2, 362 objects
-./.git/objects/pack/pack-48ea62c13417ef03711351f8e923aa73c97bad79.idx: Git pack index, version 2
-./.git/objects/f7/3b03df8966d3bf58e71a18715f9b39cd998d68: VAX COFF executable not stripped - version 19657
-./.git/refs/tags/v0.0.1.3: ASCII text
-./.git/refs/tags/v0.0.1.0: ASCII text
-./.git/refs/tags/v0.0.1.2: ASCII text
-./.git/refs/tags/v0.0.1.1: ASCII text
-./.git/refs/tags/v0.0.0.2: ASCII text
-./.git/refs/remotes/origin/development: ASCII text
-./.git/refs/remotes/origin/master: ASCII text
-./.git/refs/heads/jenkins: ASCII text
-./.git/config: ASCII text
-./.git/HEAD: ASCII text
-./FileList: ASCII text
-./manifests/params.pp: C++ source, ASCII text
-./manifests/server/install.pp: C++ source, ASCII text
-./manifests/server/service.pp: C++ source, ASCII text
-./manifests/server/user.pp: C++ source, ASCII text
-./manifests/server/dirs.pp: C++ source, ASCII text
-./manifests/server/files.pp: C++ source, ASCII text
-./manifests/init.pp: C++ source, ASCII text
-./manifests/main/config.pp: C++ source, ASCII text
--- a/6
+++ b/6
@@ -183,9 +183,9 @@ Changelog of Git Changelog.

      stage('check for UTF-8 files') {
        steps {
-          sh '''echo "$(find . -type f -exec file {} \\;)" > FileList
-            mkdir tests
-            echo  "$(grep -v ASCII FileList | grep -v git)" > tests/UTF_Files'''
+          sh '''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.3 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache)](https://jenkins.confdroid.com/job/cd_apache/)|
+|`cd_apache`| 0.0.1.4 | [![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.
@@ -110,7 +110,7 @@ All files and directories are configured with correct selinux context. If selinu
    * `--no-arrow_alignment-check`: this check leads to actually not having am easily readable arrow alignment, as this checks `per block`, not per class.
 * Puppet Parser
 * ERB Template Parser
-* Test for unwanted UTF8 files in the Puppet code
+* Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files)

 ### Contact Us
 [contact Us](https://confdroid.com/contact/)
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -44,12 +44,13 @@
 |   |-- ssl_conf.erb
 |   |-- userdir_conf.erb
 |   `-- welcome.conf
+|-- tests
+|   `-- UTF_Files
 |-- CHANGELOG.md
-|-- FileList
 |-- Gemfile
 |-- Gemfile.lock
 |-- Jenkinsfile
 |-- LICENSE
 `-- README.md

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

      <div id="footer">
-  Generated on Tue Jul 11 18:53:33 2017 by
+  Generated on Tue Jul 11 19:01:48 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.3 | <a
+|<code>cd_apache</code>| 0.0.1.4 | <a
 href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache">{Build
 Status</a>/]|</p>

@@ -260,7 +260,7 @@ block</code>, not per class.</p>
 </li><li>
 <p>ERB Template Parser</p>
 </li><li>
-<p>Test for unwanted UTF8 files in the Puppet code</p>
+<p>Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files)</p>
 </li></ul>

 <h3 id="label-Contact+Us">Contact Us</h3>
@@ -279,7 +279,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Tue Jul 11 18:53:34 2017 by
+  Generated on Tue Jul 11 19:01:49 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.3 | <a
+|<code>cd_apache</code>| 0.0.1.4 | <a
 href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache">{Build
 Status</a>/]|</p>

@@ -260,7 +260,7 @@ block</code>, not per class.</p>
 </li><li>
 <p>ERB Template Parser</p>
 </li><li>
-<p>Test for unwanted UTF8 files in the Puppet code</p>
+<p>Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files)</p>
 </li></ul>

 <h3 id="label-Contact+Us">Contact Us</h3>
@@ -279,7 +279,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Tue Jul 11 18:53:33 2017 by
+  Generated on Tue Jul 11 19:01:48 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 18:53:34 2017 by
+  Generated on Tue Jul 11 19:01:49 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 18:53:35 2017 by
+  Generated on Tue Jul 11 19:01:49 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 18:53:34 2017 by
+  Generated on Tue Jul 11 19:01:49 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 18:53:35 2017 by
+  Generated on Tue Jul 11 19:01:49 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 18:53:35 2017 by
+  Generated on Tue Jul 11 19:01:49 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 18:53:35 2017 by
+  Generated on Tue Jul 11 19:01:50 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 18:53:35 2017 by
+  Generated on Tue Jul 11 19:01:50 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 18:53:35 2017 by
+  Generated on Tue Jul 11 19:01:49 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 18:53:34 2017 by
+  Generated on Tue Jul 11 19:01:49 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>