Allow base/integration tests to run in PSI + AWS

Make it easier to handle PSI outages or those times when PSI is
overloaded with jobs by allowing base and integration tests to
run on PSI OpenStack and AWS.

Signed-off-by: Major Hayden <major@redhat.com>
This commit is contained in:
Major Hayden 2020-07-09 15:46:55 -05:00 committed by Major Hayden
parent 64652d1e3e
commit 785bdbae30

18
schutzbot/Jenkinsfile vendored
View file

@ -169,7 +169,7 @@ pipeline {
parallel {
stage('Fedora 31 base') {
agent { label "f31cloudbase && psi && x86_64" }
agent { label "f31cloudbase && x86_64 && aws" }
environment { TEST_TYPE = "base" }
steps {
unstash 'fedora31'
@ -198,7 +198,7 @@ pipeline {
}
}
stage('Fedora 31 integration') {
agent { label "f31cloudbase && psi && x86_64" }
agent { label "f31cloudbase && x86_64 && aws" }
environment {
TEST_TYPE = "integration"
AWS_CREDS = credentials('aws-credentials-osbuildci')
@ -214,7 +214,7 @@ pipeline {
}
}
stage('Fedora 32 base') {
agent { label "f32cloudbase && psi && x86_64" }
agent { label "f32cloudbase && x86_64 && aws" }
environment { TEST_TYPE = "base" }
steps {
unstash 'fedora32'
@ -243,7 +243,7 @@ pipeline {
}
}
stage('Fedora 32 integration') {
agent { label "f32cloudbase && psi && x86_64" }
agent { label "f32cloudbase && x86_64 && aws" }
environment {
TEST_TYPE = "integration"
AWS_CREDS = credentials('aws-credentials-osbuildci')
@ -259,8 +259,11 @@ pipeline {
}
}
stage('RHEL 8 CDN Base') {
agent { label "rhel8cloudbase && psi && x86_64" }
environment { TEST_TYPE = "base" }
agent { label "rhel8cloudbase && x86_64 && aws" }
environment {
RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production')
TEST_TYPE = "base"
}
steps {
unstash 'rhel8cdn'
run_tests('base')
@ -288,10 +291,11 @@ pipeline {
}
}
stage('RHEL 8 CDN integration') {
agent { label "rhel8cloudbase && psi && x86_64" }
agent { label "rhel8cloudbase && x86_64 && aws" }
environment {
TEST_TYPE = "integration"
AWS_CREDS = credentials('aws-credentials-osbuildci')
RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production')
}
steps {
unstash 'rhel8cdn'