confdroid/confdroid_nagios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'jenkins-build-238' into 'master'

Browse Source 
Auto-merge for build 238

See merge request puppet/confdroid_nagios!3
This commit is contained in:
Jenkins
2026-06-13 12:44:26 +00:00
parent 7fc4570497 6e0d1e13f6
commit 84d272ecb4
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -5,3 +5,4 @@ FileList
.vscode .vscode
.puppet-lint.rc .puppet-lint.rc
.rspec .rspec
.git/

38
Jenkinsfile vendored
View File

@@ -106,24 +106,26 @@ pipeline {
stage('Mirror to Gitea') { stage('Mirror to Gitea') {
steps { steps {
withCredentials([usernamePassword( sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
credentialsId: 'Jenkins-gitea', withCredentials([usernamePassword(
usernameVariable: 'GITEA_USER', credentialsId: 'Jenkins-gitea',
passwordVariable: 'GITEA_TOKEN')]) { usernameVariable: 'GITEA_USER',
script { passwordVariable: 'GITEA_TOKEN')]) {
// Checkout from GitLab (already done implicitly) script {
sh ''' // Checkout from GitLab (already done implicitly)
git checkout master sh '''
git pull origin master git checkout master
git branch -D development git pull origin master
git branch -D jenkins-build-$BUILD_NUMBER git branch -D development
git rm -f Jenkinsfile git branch -D jenkins-build-$BUILD_NUMBER
git rm -r --cached .vscode || echo "No .vscode to remove from git" git rm -f Jenkinsfile
git commit --amend --no-edit --allow-empty git rm -r --cached .vscode || echo "No .vscode to remove from git"
git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_nagios.git git commit --amend --no-edit --allow-empty
git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \ git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_nagios.git
push master --mirror git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
''' push master --mirror
'''
}
} }
} }
} }