From 9b646162ae4c877843d74332d30edaffe0d9f8d5 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 11 Jul 2017 17:31:45 +0100 Subject: [PATCH 1/2] added new Jenkins test to check for unwanted UTF8 files --- Jenkinsfile | 7 +++++++ README.md | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7315488..15c4a35 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -181,6 +181,13 @@ 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''' + } + } + stage('show diff') { steps { sh 'git diff' diff --git a/README.md b/README.md index 4a73c17..7d3c807 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |Repo Name| version | Build Status| |---|---|---|---| -|`cd_apache`| 0.0.1.2 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_apache)](https://jenkins.confdroid.com/job/cd_apache/)| +|`cd_apache`| 0.0.1.3 | [![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,6 +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 ### Contact Us [contact Us](https://confdroid.com/contact/) From a1b2032baaaf7457d7883394cf0f03ca159123d8 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 11 Jul 2017 18:32:16 +0200 Subject: [PATCH 2/2] recommit for updates in build 11 --- CHANGELOG.md | 10 +++ FileList | 80 +++++++++++++++++++ doc/_index.html | 2 +- doc/file.README.html | 6 +- doc/index.html | 6 +- doc/puppet_classes/cd_apache.html | 2 +- .../cd_apache_3A_3Amain_3A_3Aconfig.html | 2 +- doc/puppet_classes/cd_apache_3A_3Aparams.html | 2 +- .../cd_apache_3A_3Aserver_3A_3Adirs.html | 2 +- .../cd_apache_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_apache_3A_3Aserver_3A_3Ainstall.html | 2 +- .../cd_apache_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_apache_3A_3Aserver_3A_3Auser.html | 2 +- doc/top-level-namespace.html | 2 +- 14 files changed, 108 insertions(+), 14 deletions(-) create mode 100644 FileList diff --git a/CHANGELOG.md b/CHANGELOG.md index 7105b6b..1015904 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+c380f8f9960fa1a Jenkins Server 2017-07-10 18:00:02 +

+

recommit for updates in build 10

+ +

+df0edc483d0918b Arne Teuke 2017-07-10 17:59:32 +

+

converted LICENSE to ASCII

+ +

ed5ca1113ea3170 Jenkins Server 2017-07-09 15:24:08

recommit for updates in build 9

diff --git a/FileList b/FileList new file mode 100644 index 0000000..ed3d287 --- /dev/null +++ b/FileList @@ -0,0 +1,80 @@ +./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, 43 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/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/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 +./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 diff --git a/doc/_index.html b/doc/_index.html index f1f0e52..82553de 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -137,7 +137,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 20c86a7..d80ce93 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -61,7 +61,7 @@

|Repo Name| version | Build Status| |---|---|---|---| -|cd_apache| 0.0.1.2 | cd_apache| 0.0.1.3 | {Build Status/]|

@@ -259,6 +259,8 @@ block, not per class.

Puppet Parser

  • ERB Template Parser

    +
  • +

    Test for unwanted UTF8 files in the Puppet code

    • Contact Us

    @@ -277,7 +279,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index ab6ed9a..a397c02 100644 --- a/doc/index.html +++ b/doc/index.html @@ -61,7 +61,7 @@

    |Repo Name| version | Build Status| |---|---|---|---| -|cd_apache| 0.0.1.2 | cd_apache| 0.0.1.3 | {Build Status/]|

    @@ -259,6 +259,8 @@ block, not per class.

    Puppet Parser

  • ERB Template Parser

    +
  • +

    Test for unwanted UTF8 files in the Puppet code

    • Contact Us

    @@ -277,7 +279,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_apache.html b/doc/puppet_classes/cd_apache.html index 53585c5..313ab88 100644 --- a/doc/puppet_classes/cd_apache.html +++ b/doc/puppet_classes/cd_apache.html @@ -140,7 +140,7 @@ class cd_apache { diff --git a/doc/puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_apache_3A_3Amain_3A_3Aconfig.html index 70a700c..e414106 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_apache_3A_3Aparams.html b/doc/puppet_classes/cd_apache_3A_3Aparams.html index f1acf58..5940fdd 100644 --- 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 = 'cd_apache/userdir_conf.erb' diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Adirs.html index 1748e5d..75ea642 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Afiles.html index e747b04..4443157 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Ainstall.html index 71a408a..3bf37a7 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Aservice.html index ce9297d..c22fc34 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html b/doc/puppet_classes/cd_apache_3A_3Aserver_3A_3Auser.html index 74a4652..5685bad 100644 --- 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 ( diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index 1d55399..98b8454 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@