Merge branch 'jenkins' into 'master'

Jenkins See merge request !10
2017-07-11 18:46:16 +02:00
parent 6ae6ad8f57 3764f0bef1
commit 1183def439
18 changed files with 50 additions and 24 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 # .gitignore for cd_apache
 .yardoc
 Gemfile.lock
+FileList
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,15 +8,15 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


+<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>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/c380f8f9960fa1a">c380f8f9960fa1a</a> Jenkins Server <i>2017-07-10 18:00:02</i>
 <p>
 <h3>recommit for updates in build 10</h3>

-</p>
-<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/df0edc483d0918b">df0edc483d0918b</a> Arne Teuke <i>2017-07-10 17:59:32</i>
-<p>
-<h3>converted LICENSE to ASCII</h3>
-
 </p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/ed5ca1113ea3170">ed5ca1113ea3170</a> Jenkins Server <i>2017-07-09 15:24:08</i>
 <p>
@@ -24,6 +24,21 @@ Changelog of Git Changelog.

 </p>

+<h2> v0.0.1.3 </h2>
+<h2> No issue </h2>
+
+
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/9b646162ae4c877">9b646162ae4c877</a> Arne Teuke <i>2017-07-11 16:31:45</i>
+<p>
+<h3>added new Jenkins test to check for unwanted UTF8 files</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/df0edc483d0918b">df0edc483d0918b</a> Arne Teuke <i>2017-07-10 17:59:32</i>
+<p>
+<h3>converted LICENSE to ASCII</h3>
+
+</p>
+
 <h2> v0.0.1.2 </h2>
 <h2> No issue </h2>

--- a/12
+++ b/12
@@ -40,7 +40,7 @@
 ./templates/welcome.conf: ASCII text
 ./templates/ssl_conf.erb: ASCII text
 ./.git/FETCH_HEAD: ASCII text
-./.git/index: Git index, version 2, 43 entries
+./.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
@@ -57,10 +57,11 @@
 ./.git/ORIG_HEAD: ASCII text
 ./.git/description: ASCII text
 ./.git/info/exclude: ASCII text
-./.git/objects/55/d6ef671b094da9289f341f9875f37117f30d42: VAX COFF executable not stripped - version 19657
-./.git/objects/pack/pack-399f76618aff75f69b65613e78d7b29e36b7ceb7.idx: Git pack index, version 2
-./.git/objects/pack/pack-399f76618aff75f69b65613e78d7b29e36b7ceb7.pack: Git pack, version 2, 336 objects
-./.git/objects/72/70cd3704c6a768ba09411a771457fd318f18cc: VAX COFF executable not stripped - version 1297
+./.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
@@ -70,6 +71,7 @@
 ./.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
--- a/3
+++ b/3
@@ -184,7 +184,8 @@ Changelog of Git Changelog.
      stage('check for UTF-8 files') {
        steps {
          sh '''echo "$(find . -type f -exec file {} \\;)" > FileList
-            grep -v ASCII FileList | grep -v git'''
+            mkdir tests
+            echo  "$(grep -v ASCII FileList | grep -v git)" > tests/UTF_Files'''
        }
      }

--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -45,10 +45,11 @@
 |   |-- userdir_conf.erb
 |   `-- welcome.conf
 |-- CHANGELOG.md
+|-- FileList
 |-- Gemfile
 |-- Gemfile.lock
 |-- Jenkinsfile
 |-- LICENSE
 `-- README.md

-9 directories, 42 files
+9 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:32:12 2017 by
+  Generated on Tue Jul 11 18:53:33 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
@@ -279,7 +279,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Tue Jul 11 18:32:13 2017 by
+  Generated on Tue Jul 11 18:53:34 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
@@ -279,7 +279,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Tue Jul 11 18:32:13 2017 by
+  Generated on Tue Jul 11 18:53:33 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:32:14 2017 by
+  Generated on Tue Jul 11 18:53:34 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:32:14 2017 by
+  Generated on Tue Jul 11 18:53:35 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:32:14 2017 by
+  Generated on Tue Jul 11 18:53:34 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:32:14 2017 by
+  Generated on Tue Jul 11 18:53:35 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:32:14 2017 by
+  Generated on Tue Jul 11 18:53:35 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:32:14 2017 by
+  Generated on Tue Jul 11 18:53:35 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:32:14 2017 by
+  Generated on Tue Jul 11 18:53:35 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:32:14 2017 by
+  Generated on Tue Jul 11 18:53:35 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:32:13 2017 by
+  Generated on Tue Jul 11 18:53:34 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
@@ -0,0 +1,6 @@
+./.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