From d9019b514c785c1aaec600d63647e0b591c4b1e3 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sun, 4 May 2025 21:30:47 +0200 Subject: [PATCH] update Jenkinsfile and Readme --- .mdl_style.rb | 3 -- .mdlrc | 2 - .spelling | 141 -------------------------------------------------- Jenkinsfile | 27 ++-------- README.md | 2 - 5 files changed, 5 insertions(+), 170 deletions(-) delete mode 100644 .mdl_style.rb delete mode 100644 .mdlrc delete mode 100644 .spelling diff --git a/.mdl_style.rb b/.mdl_style.rb deleted file mode 100644 index 5d4d3b9..0000000 --- a/.mdl_style.rb +++ /dev/null @@ -1,3 +0,0 @@ -all -rule 'MD013', :line_length => 1000 -exclude_rule 'MD036' diff --git a/.mdlrc b/.mdlrc deleted file mode 100644 index e5c563a..0000000 --- a/.mdlrc +++ /dev/null @@ -1,2 +0,0 @@ -style '.mdl_style.rb' - diff --git a/.spelling b/.spelling deleted file mode 100644 index 7427418..0000000 --- a/.spelling +++ /dev/null @@ -1,141 +0,0 @@ -# markdown-spellcheck spelling configuration file -# Format - lines begining # are comments -# global dictionary is at the start, file overrides afterwards -# one word per line, to define a file override use ' - filename' -# where filename is relative to this configuration file -Readme.md -httpd -sudo -selinux -site.pp -nodes.pp -cd_apache -:: -params -Foreman -cd_resources -CentOS -Puppet -ConfDroid -nagios -vHosts -vHost -phpMyAdmin -phpPgAdmin -parameterized -erb -Confdroid.com -UTF_Files -Elasticsearch -cd_firewall -puppetlabs -cd_elasticsearch -cd_fail2ban -Fail2Ban -intrusion -fail2ban -firewalld -prevention -management -CentOS7 -auto-installed -filebeat -Elastic -installer -Foreman -postgresql -TLS -cd_foreman -install.sh -git -cd_git -Gitlab -gitlab -gitlab-ce -gitlab.rb -psql -setup -service -user -optional -postgresql -database -via -tls -encryption -certbot -cd_postgresql -cd_certbot -cd_gitlab -sourcecode -pg_hba.conf -hiera -cd_tls -ca_chain -config -gitlab-ctl -haproxy -cd_concat -concat -cd_haproxy -haproxy.cfg -fqdn -ACLs -contineous -Jenkinsfiles -Jenkinsfile -SEEDjob -Github -job-dsl -community -providing -API -REGEX -plugins -cd_jenkins -cd_java -cd_nagios -cd_kibana -Kibana -Elastic -Stack -elasticsearch -MySQL -mysql -my.conf -cd_mysql -mysqld -PuppetDB -cd_selinux -cd_nrpe -cd_stdlib -puppetlabs -cd_concat -stdlib -cd_puppetdb -SSL -vhost -nrpe -iptables -NTP -manycast -cd_ntp -remi -repo -cd_php -Cyril -Roundcube -Dovecot -postmap -cd_postfix -pg_hba -pgdata -puppetserver -puppetdb -r10k -cd_puppet -cri -Rsyslog -Linux -Unix -cd_rsyslog diff --git a/Jenkinsfile b/Jenkinsfile index 3cca851..1261273 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { } options { - gitLabConnection('sourcecode.confdroid.com') + gitLabConnection('gitlab.confdroid.com') } stages { @@ -64,36 +64,19 @@ pipeline { } } - stage('markdown-lint') { - steps { - sh ''' - source /opt/rh/rh-ruby27/enable - mdl README.md - ''' - } - } - - stage('spell check') { - steps { - sh ''' - mdspell -r -n -a "**/*.md" - ''' - } - } - - stage('SonarScan') { + stage('SonarScan') { steps { sh ''' /opt/sonar-scanner/bin/sonar-scanner \ -Dsonar.projectKey=cd_selinux \ -Dsonar.sources=. \ - -Dsonar.host.url=http://sonarqube.confdroid.com \ - -Dsonar.login=f4d68d1f43370b34439eee7fbf5e2b6182cf449c + -Dsonar.host.url=https://sonarqube.confdroid.com \ + -Dsonar.token=sqa_aca21cc41336d0f31987ed196ccfb9be55ded774 ''' } } - stage('create Puppet documention') { + stage('create Puppet documentation') { steps { sh '/opt/puppetlabs/bin/puppet strings' } diff --git a/README.md b/README.md index b0e0b5b..82c1f50 100644 --- a/README.md +++ b/README.md @@ -77,8 +77,6 @@ All files and directories are configured with correct selinux context. If selinu * Puppet Parser * ERB Template Parser * Test for unwanted UTF8 files in the Puppet code (see tests/UTF_Files) -* Markdown-lint -* Spellcheck * Sonar Quality Gate ## Contact Us