From f2775a39b4058d4f7fc8d0ea12f66ce5a4f21b28 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@redhat.com>
Date: Tue, 14 Jul 2020 08:44:13 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=A6=F0=9F=8F=BB=E2=80=8D=E2=99=82?=
 =?UTF-8?q?=EF=B8=8F=20Fix=20errors=20from=20pipeline=20restructuring?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/schutzbot/Jenkinsfile b/schutzbot/Jenkinsfile
index bd5a21f61..a35925bbe 100644
--- a/schutzbot/Jenkinsfile
+++ b/schutzbot/Jenkinsfile
@@ -129,7 +129,7 @@ pipeline {
                             }
                             post {
                                 always {
-                                    preserve_logs('fedora31-base')
+                                    preserve_logs('fedora31-base-aarch64')
                                 }
                             }
                         }
@@ -233,7 +233,7 @@ pipeline {
                             }
                             post {
                                 always {
-                                    preserve_logs('fedora32-base')
+                                    preserve_logs('fedora32-base-aarch64')
                                 }
                             }
                         }
@@ -347,7 +347,7 @@ pipeline {
                             }
                             post {
                                 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.
                 stage("RHEL8.3 x86") {
                     stages {
-                        stage('RHEL 8.3 Nightly') {
+                        stage('Mock build') {
                             agent { label "rhel83cloudbase && x86_64" }
                             environment {
                                 AWS_CREDS = credentials('aws-credentials-osbuildci')
@@ -376,7 +376,7 @@ pipeline {
                                 )
                             }
                         }
-                        stage('RHEL 8.3 Base') {
+                        stage('Base') {
                             agent { label "rhel83cloudbase && x86_64" }
                             environment { TEST_TYPE = "base" }
                             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')
+                                }
+                            }
+                        }
                     }
                 }
             }