particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🤦🏻‍♂️ Fix errors from pipeline restructuring

Browse source 
During the last PR that restructured the pipeline, some copy/paste
errors happened and RHEL8.3 lost some tests. Also, some of the log
directories for x86/aarch64 tests overlapped.

Signed-off-by: Major Hayden <major@redhat.com>
This commit is contained in:
Major Hayden 2020-07-14 08:44:13 -05:00 • committed by Ondřej Budai
parent 45c159e7f8
commit f2775a39b4
1 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

43
schutzbot/Jenkinsfile vendored
View file

@ -129,7 +129,7 @@ pipeline {
} }
post { post {
always { always {
preserve_logs('fedora31-base') preserve_logs('fedora31-base-aarch64')
} }
} }
} }
@ -233,7 +233,7 @@ pipeline {
} }
post { post {
always { always {
preserve_logs('fedora32-base') preserve_logs('fedora32-base-aarch64')
} }
} }
} }
@ -347,7 +347,7 @@ pipeline {
} }
post { post {
always { always {
preserve_logs('fedora32-base') preserve_logs('rhel8-base-aarch64')
} }
} }
} }
@ -358,7 +358,7 @@ pipeline {
// in PSI until 8.3 beta content appears on the public CDN. // in PSI until 8.3 beta content appears on the public CDN.
stage("RHEL8.3 x86") { stage("RHEL8.3 x86") {
stages { stages {
stage('RHEL 8.3 Nightly') { stage('Mock build') {
agent { label "rhel83cloudbase && x86_64" } agent { label "rhel83cloudbase && x86_64" }
environment { environment {
AWS_CREDS = credentials('aws-credentials-osbuildci') AWS_CREDS = credentials('aws-credentials-osbuildci')
@ -376,7 +376,7 @@ pipeline {
) )
} }
} }
stage('RHEL 8.3 Base') { stage('Base') {
agent { label "rhel83cloudbase && x86_64" } agent { label "rhel83cloudbase && x86_64" }
environment { TEST_TYPE = "base" } environment { TEST_TYPE = "base" }
steps { steps {
@ -389,7 +389,38 @@ pipeline {
} }
} }
} }
stage('Image') {
agent { label "rhel83cloudbase && x86_64" }
environment {
TEST_TYPE = "image"
AWS_CREDS = credentials('aws-credentials-osbuildci')
}
steps {
unstash 'rhel83'
run_tests('image')
}
post {
always {
preserve_logs('rhel83-image')
}
}
}
stage('Integration') {
agent { label "rhel83cloudbase && x86_64" }
environment {
TEST_TYPE = "integration"
AWS_CREDS = credentials('aws-credentials-osbuildci')
}
steps {
unstash 'rhel83'
run_tests('integration')
}
post {
always {
preserve_logs('rhel83-integration')
}
}
}
} }
} }
} }