From eacdc6522bc654ceaee6a0c169e44f0bcca4cede Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 11 Jul 2017 18:14:21 +0100 Subject: [PATCH 1/4] updated README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 729023d..6e8d06f 100644 --- 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.6 | [![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. From 387ab193a95da9e0e753b8d0340ebbe148b3975d Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 11 Jul 2017 18:24:39 +0100 Subject: [PATCH 2/4] more improved testing --- Jenkinsfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 47a0619..e88dff1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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''' } From 4296733d3e34a378c5af6f9d5e4f623e431365ab Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 11 Jul 2017 18:26:50 +0100 Subject: [PATCH 3/4] more improved testing --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6e8d06f..2ccf3ec 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |Repo Name| version | Build Status| |---|---|---|---| -|`cd_apache`| 0.0.1.6 | [![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. From 692569d70082d85d1ee3677185873133c7e5523a Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 11 Jul 2017 19:27:24 +0200 Subject: [PATCH 4/4] recommit for updates in build 20 --- CHANGELOG.md | 10 ++++++++++ REPOSTRUCTURE.md | 5 +++-- doc/_index.html | 2 +- doc/file.README.html | 4 ++-- doc/index.html | 4 ++-- 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, 27 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26c5aaa..1640d00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+5556fd1ec6fdd8d Jenkins Server 2017-07-11 17:12:52 +

+

recommit for updates in build 17

+ +

+08da1c5e7004f15 Arne Teuke 2017-07-11 17:12:23 +

+

finalised this stage

+ +

c1963582f006a9d Jenkins Server 2017-07-11 17:08:47

recommit for updates in build 16

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 9155ff6..e18195c 100644 --- 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 diff --git a/doc/_index.html b/doc/_index.html index edbb9a7..4157de1 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 864e9d2..95d7256 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.5 | cd_apache| 0.0.1.7 | {Build Status/]|

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

diff --git a/doc/index.html b/doc/index.html index 96acfcd..85ccdff 100644 --- a/doc/index.html +++ b/doc/index.html @@ -61,7 +61,7 @@

|Repo Name| version | Build Status| |---|---|---|---| -|cd_apache| 0.0.1.5 | cd_apache| 0.0.1.7 | {Build Status/]|

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

diff --git a/doc/puppet_classes/cd_apache.html b/doc/puppet_classes/cd_apache.html index 9d25260..4241a32 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 7746449..aa6c7e9 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 b9fa7d6..f0686e1 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 e91a1a0..ec97432 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 4f95b37..e470a33 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 25130ba..6eca8d4 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 32680bd..06fdb69 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 cf60ab2..d6e80a7 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 12a6f28..d3081e8 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@