From 70f76041c9d64784cd4e84d3d3cbff4ea744cc86 Mon Sep 17 00:00:00 2001
From: Toastie <toastie@toastiet0ast.com>
Date: Thu, 27 Mar 2025 15:22:24 +1300
Subject: [PATCH] Removed some unnecessary stuff in the Jenkinsfile
---
Jenkinsfile | 57 +++--------------------------------------------------
1 file changed, 3 insertions(+), 54 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ac95a71..db7026e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -47,8 +47,7 @@ pipeline
{
sh 'rpmbuild -bb packaging/supportchild.spec --define "_topdir $PWD/.rpmbuild-el9" --define "dev_build true"'
sh 'cp .rpmbuild-el9/RPMS/x86_64/supportchild-dev-*.x86_64.rpm linux-x64/'
- archiveArtifacts(artifacts: 'linux-x64/supportchild-dev-*.x86_64.rpm', caseSensitive: true)
- stash includes: 'linux-x64/supportchild-dev-*.x86_64.rpm', name: 'el9-rpm'
+ archiveArtifacts(artifacts: 'linux-x64/supportchild-dev-*.el9.x86_64.rpm', caseSensitive: true)
}
}
stage('RHEL8')
@@ -62,8 +61,7 @@ pipeline
{
sh 'rpmbuild -bb packaging/supportchild.spec --define "_topdir $PWD/.rpmbuild-el8" --define "dev_build true"'
sh 'cp .rpmbuild-el8/RPMS/x86_64/supportchild-dev-*.x86_64.rpm linux-x64/'
- archiveArtifacts(artifacts: 'linux-x64/supportchild-dev-*.x86_64.rpm', caseSensitive: true)
- stash includes: 'linux-x64/supportchild-dev-*.x86_64.rpm', name: 'el8-rpm'
+ archiveArtifacts(artifacts: 'linux-x64/supportchild-dev-*.el8.x86_64.rpm', caseSensitive: true)
}
}
stage('Fedora')
@@ -77,56 +75,7 @@ pipeline
{
sh 'rpmbuild -bb packaging/supportchild.spec --define "_topdir $PWD/.rpmbuild-fedora" --define "dev_build true"'
sh 'cp .rpmbuild-fedora/RPMS/x86_64/supportchild-dev-*.x86_64.rpm linux-x64/'
- archiveArtifacts(artifacts: 'linux-x64/supportchild-dev-*.x86_64.rpm', caseSensitive: true)
- stash includes: 'linux-x64/supportchild-dev-*.x86_64.rpm', name: 'fedora-rpm'
- }
- }
- }
- }
- stage('Deploy')
- {
- parallel
- {
- stage('RHEL9')
- {
- when
- {
- expression { return env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'beta'; }
- }
- steps
- {
- unstash name: 'el9-rpm'
- sh 'mkdir -p /usr/share/nginx/repo.toastiet0ast.com/rhel/el9/packages/supportchild/'
- sh 'cp linux-x64/supportchild-dev-*.x86_64.rpm /usr/share/nginx/repo.toastiet0ast.com/rhel/el9/packages/supportchild/'
- sh 'createrepo_c --update /usr/share/nginx/repo.toastiet0ast.com/rhel/el9'
- }
- }
- stage('RHEL8')
- {
- when
- {
- expression { return env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'beta'; }
- }
- steps
- {
- unstash name: 'el8-rpm'
- sh 'mkdir -p /usr/share/nginx/repo.toastiet0ast.com/rhel/el8/packages/supportchild/'
- sh 'cp linux-x64/supportchild-dev-*.x86_64.rpm /usr/share/nginx/repo.toastiet0ast.com/rhel/el8/packages/supportchild/'
- sh 'createrepo_c --update /usr/share/nginx/repo.toastiet0ast.com/rhel/el8'
- }
- }
- stage('Fedora')
- {
- when
- {
- expression { return env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'beta'; }
- }
- steps
- {
- unstash name: 'fedora-rpm'
- sh 'mkdir -p /usr/share/nginx/repo.toastiet0ast.com/fedora/packages/supportchild/'
- sh 'cp linux-x64/supportchild-dev-*.x86_64.rpm /usr/share/nginx/repo.toastiet0ast.com/fedora/packages/supportchild/'
- sh 'createrepo_c --update /usr/share/nginx/repo.toastiet0ast.com/fedora'
+ archiveArtifacts(artifacts: 'linux-x64/supportchild-dev-*.fedora.x86_64.rpm', caseSensitive: true)
}
}
}