diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 13bbd81..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,79 +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('update repo') { - steps { - sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { - sh ''' - git config user.name "Jenkins Server" - git config user.email jenkins@confdroid.com - 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 { - 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 commit --amend --no-edit --allow-empty - git remote add master https://gitea.confdroid.com/confdroid/confdroid-package-management.git - git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \ - push master --mirror - ''' - } - } - } - } - } -} \ No newline at end of file diff --git a/README.md b/README.md index caa9d73..d5c1d9e 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Readme -This repository hosts the public GPG key used for signing RPM packages provided by [Your Project Name]. The key is made available for users to import and verify the authenticity and integrity of our distributed RPMs. +This repository hosts the public GPG key used for signing RPM packages provided by Confdroid Package Management. The key is made available for users to import and verify the authenticity and integrity of our distributed RPMs. ## Purpose -- **Public GPG Key Distribution**: The primary file here is `RPM-GPG-KEY-[yourproject].asc`, which you can import to trust and verify RPM packages from our forge or repository. -- This repo is public to allow easy access to the key via a direct URL. For the actual RPM packages, refer to our main project repository or download site at [link to your RPM repo or forge page, e.g., https://github.com/yourusername/your-rpm-repo/releases]. +- **Public GPG Key Distribution**: The primary file here is `RPM-GPG-KEY-public.asc`, which you can import to trust and verify RPM packages from our forge or repository. +- This repo is public to allow easy access to the key via a direct URL. For the actual RPM packages, refer to project repository in question. ## How to Import the GPG Key To verify our RPM packages, import this public key on your system. Use the direct raw URL for the key file.