Recommit for updates in build 18
This commit is contained in:
62
.vscode/settings.json
vendored
62
.vscode/settings.json
vendored
@@ -1,62 +0,0 @@
|
|||||||
{
|
|
||||||
"cSpell.words": [
|
|
||||||
"ALLMATCHSCAN",
|
|
||||||
"authenticode",
|
|
||||||
"behaviour",
|
|
||||||
"bofh",
|
|
||||||
"clamav",
|
|
||||||
"clamd",
|
|
||||||
"clamdscan",
|
|
||||||
"clamonacc",
|
|
||||||
"clamscan",
|
|
||||||
"Clamuko",
|
|
||||||
"clamupdate",
|
|
||||||
"concurrentdatabasereload",
|
|
||||||
"Dazuko",
|
|
||||||
"dbname",
|
|
||||||
"epel",
|
|
||||||
"excludepaths",
|
|
||||||
"fanotify",
|
|
||||||
"fdpass",
|
|
||||||
"filesize",
|
|
||||||
"freshclam",
|
|
||||||
"getsebool",
|
|
||||||
"INADDR",
|
|
||||||
"kubelet",
|
|
||||||
"libclamav",
|
|
||||||
"logclean",
|
|
||||||
"logfacility",
|
|
||||||
"logfile",
|
|
||||||
"logfilemaxsize",
|
|
||||||
"logfileunlock",
|
|
||||||
"logrotation",
|
|
||||||
"logsyslog",
|
|
||||||
"logtime",
|
|
||||||
"logverbose",
|
|
||||||
"MAINPID",
|
|
||||||
"multiscan",
|
|
||||||
"mypass",
|
|
||||||
"myproxy",
|
|
||||||
"myusername",
|
|
||||||
"NOFILE",
|
|
||||||
"normalisation",
|
|
||||||
"PCRE",
|
|
||||||
"pipefail",
|
|
||||||
"preludeanalyzername",
|
|
||||||
"preludeenable",
|
|
||||||
"recieve",
|
|
||||||
"RLIMIT",
|
|
||||||
"safebrowsing",
|
|
||||||
"setsebool",
|
|
||||||
"subsig",
|
|
||||||
"subsigs",
|
|
||||||
"tcpaddre",
|
|
||||||
"tcpaddress",
|
|
||||||
"tcpsocket",
|
|
||||||
"VIRUSEVENT",
|
|
||||||
"virusgroup",
|
|
||||||
"VIRUSNAME",
|
|
||||||
"XMLDOCS",
|
|
||||||
"xxxyyzzzz"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
128
Jenkinsfile
vendored
128
Jenkinsfile
vendored
@@ -1,128 +0,0 @@
|
|||||||
pipeline {
|
|
||||||
agent {
|
|
||||||
label 'puppet'
|
|
||||||
}
|
|
||||||
|
|
||||||
post {
|
|
||||||
always {
|
|
||||||
deleteDir() /* clean up our workspace */
|
|
||||||
}
|
|
||||||
success {
|
|
||||||
updateGitlabCommitStatus state: 'success'
|
|
||||||
}
|
|
||||||
failure {
|
|
||||||
updateGitlabCommitStatus state: 'failed'
|
|
||||||
step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'support@confdroid.com', sendToIndividuals: true])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
options {
|
|
||||||
gitLabConnection('gitlab.confdroid.com')
|
|
||||||
}
|
|
||||||
|
|
||||||
stages {
|
|
||||||
|
|
||||||
stage('pull master') {
|
|
||||||
steps {
|
|
||||||
sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
|
|
||||||
sh '''
|
|
||||||
git config user.name "Jenkins Server"
|
|
||||||
git config user.email jenkins@confdroid.com
|
|
||||||
# Ensure we're on the development branch (triggered by push)
|
|
||||||
git checkout development
|
|
||||||
# Create jenkins branch from development
|
|
||||||
git checkout -b jenkins-build-$BUILD_NUMBER
|
|
||||||
# Optionally merge master into jenkins to ensure compatibility
|
|
||||||
git merge origin/master --no-ff || { echo "Merge conflict detected"; exit 1; }
|
|
||||||
'''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('puppet parser') {
|
|
||||||
steps {
|
|
||||||
sh '''for file in $(find . -iname \'*.pp\'); do
|
|
||||||
/opt/puppetlabs/bin/puppet parser validate --color false --render-as s --modulepath=modules $file || exit 1;
|
|
||||||
done;'''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('check templates') {
|
|
||||||
steps{
|
|
||||||
sh '''for file in $(find . -iname \'*.erb\');
|
|
||||||
do erb -P -x -T "-" $file | ruby -c || exit 1;
|
|
||||||
done;'''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('puppet-lint') {
|
|
||||||
steps {
|
|
||||||
sh '''/usr/local/bin/puppet-lint . \\
|
|
||||||
--no-variable_scope-check \\
|
|
||||||
|| { echo "Puppet lint failed"; exit 1; }
|
|
||||||
'''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('SonarScan') {
|
|
||||||
steps {
|
|
||||||
withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
|
|
||||||
sh '''
|
|
||||||
/opt/sonar-scanner/bin/sonar-scanner \
|
|
||||||
-Dsonar.projectKey=confdroid_clamav \
|
|
||||||
-Dsonar.sources=. \
|
|
||||||
-Dsonar.host.url=https://sonarqube.confdroid.com \
|
|
||||||
-Dsonar.token=$SONAR_TOKEN
|
|
||||||
'''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('create Puppet documentation') {
|
|
||||||
steps {
|
|
||||||
sh '/opt/puppetlabs/bin/puppet strings'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('update repo') {
|
|
||||||
steps {
|
|
||||||
sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
|
|
||||||
sh '''
|
|
||||||
git config user.name "Jenkins Server"
|
|
||||||
git config user.email jenkins@confdroid.com
|
|
||||||
git rm -r --cached .vscode || echo "No .vscode to remove from git"
|
|
||||||
git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
|
|
||||||
git push origin HEAD:master
|
|
||||||
'''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('Mirror to Gitea') {
|
|
||||||
steps {
|
|
||||||
sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
|
|
||||||
withCredentials([usernamePassword(
|
|
||||||
credentialsId: 'Jenkins-gitea',
|
|
||||||
usernameVariable: 'GITEA_USER',
|
|
||||||
passwordVariable: 'GITEA_TOKEN')]) {
|
|
||||||
script {
|
|
||||||
// Checkout from GitLab (already done implicitly)
|
|
||||||
sh '''
|
|
||||||
git checkout master
|
|
||||||
git pull origin master
|
|
||||||
git branch -D development
|
|
||||||
git branch -D jenkins-build-$BUILD_NUMBER
|
|
||||||
git rm -f Jenkinsfile
|
|
||||||
git rm -r --cached .vscode || echo "No .vscode to remove from git"
|
|
||||||
git commit --amend --no-edit --allow-empty
|
|
||||||
git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_clamav.git
|
|
||||||
git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
|
|
||||||
push master --mirror
|
|
||||||
'''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -227,18 +227,18 @@ class confdroid_clamav::main::files (
|
|||||||
}
|
}
|
||||||
|
|
||||||
# clamd service config file
|
# clamd service config file
|
||||||
# file { $cv_clamd_svc :
|
file { $cv_clamd_svc :
|
||||||
# ensure => file,
|
ensure => file,
|
||||||
# owner => 'root',
|
owner => 'root',
|
||||||
# group => 'root',
|
group => 'root',
|
||||||
# mode => '0600',
|
mode => '0600',
|
||||||
# selrange => s0,
|
selrange => s0,
|
||||||
# selrole => object_r,
|
selrole => object_r,
|
||||||
# seltype => etc_t,
|
seltype => etc_t,
|
||||||
# seluser => system_u,
|
seluser => system_u,
|
||||||
# content => template($cv_clamd_svc_erb),
|
content => template($cv_clamd_svc_erb),
|
||||||
# notify => Service[$cv_service],
|
notify => Service[$cv_service],
|
||||||
# }
|
}
|
||||||
|
|
||||||
# shell script for scanning and alerting
|
# shell script for scanning and alerting
|
||||||
file { $cv_shell_script :
|
file { $cv_shell_script :
|
||||||
|
|||||||
Reference in New Issue
Block a user