From 785bdbae3011e5907eb1af83fa6dd7ef3db43392 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@redhat.com>
Date: Thu, 9 Jul 2020 15:46:55 -0500
Subject: [PATCH] =?UTF-8?q?=E2=9B=85=20Allow=20base/integration=20tests=20?=
 =?UTF-8?q?to=20run=20in=20PSI=20+=20AWS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 schutzbot/Jenkinsfile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/schutzbot/Jenkinsfile b/schutzbot/Jenkinsfile
index 1a998526a..4036030bb 100644
--- a/schutzbot/Jenkinsfile
+++ b/schutzbot/Jenkinsfile
@@ -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'