tests: add logic to not fail when trying to send the logs to s3 (#2855)

* tests: add logic to not fail when trying to send the logs to s3 * tests: change the aws key random name
coreos · Jan 30, 2018 · b6b3195 · b6b3195
1 parent 0327326
commit b6b3195
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -63,6 +63,7 @@ pipeline {
   agent none
   environment {
     KUBE_CONFORMANCE_IMAGE = 'quay.io/coreos/kube-conformance:v1.8.4_coreos.0'
+    LOGSTASH_BUCKET= "log-analyzer-tectonic-installer"
   }
   options {
     // Individual steps have stricter timeouts. 360 minutes should be never reached.
@@ -415,7 +416,6 @@ pipeline {
             script {
               try {
                 sh """#!/bin/bash -xe
-                export LOGSTASH_BUCKET='log-analyzer-tectonic-installer'
                 export BUILD_RESULT=${currentBuild.currentResult}
                 ./tests/jenkins-jobs/scripts/log-analyzer-copy.sh jenkins-logs
                 """
@@ -486,12 +486,19 @@ def runRSpecTest(testFilePath, dockerArgs, credentials) {
         archiveArtifacts allowEmptyArchive: true, artifacts: 'build/**/logs/**'
         withDockerContainer(params.builder_image) {
          withCredentials(creds) {
-           sh """#!/bin/bash -xe
-           ./tests/jenkins-jobs/scripts/log-analyzer-copy.sh smoke-test-logs ${testFilePath}
-           """
+          script {
+            try {
+              sh """#!/bin/bash -xe
+              ./tests/jenkins-jobs/scripts/log-analyzer-copy.sh smoke-test-logs ${testFilePath}
+              """
+            } catch (Exception e) {
+              notifyBuildSlack(true)
+            } finally {
+              cleanWs notFailBuild: true
+            }
+          }
          }
         }
-
         cleanWs notFailBuild: true
       }
 
@@ -529,9 +536,17 @@ def runRSpecTestBareMetal(testFilePath, credentials) {
         reportStatusToGithub((err == null) ? 'success' : 'failure', testFilePath, originalCommitId)
         archiveArtifacts allowEmptyArchive: true, artifacts: 'build/**/logs/**'
         withCredentials(credentials) {
-          sh """#!/bin/bash -xe
-          ./tests/jenkins-jobs/scripts/log-analyzer-copy.sh smoke-test-logs ${testFilePath}
-           """
+          script {
+            try {
+              sh """#!/bin/bash -xe
+              ./tests/jenkins-jobs/scripts/log-analyzer-copy.sh smoke-test-logs ${testFilePath}
+              """
+            } catch (Exception e) {
+              notifyBuildSlack(true)
+            } finally {
+              cleanWs notFailBuild: true
+            }
+          }
          }
         cleanWs notFailBuild: true
       }

diff --git a/tests/rspec/lib/name_generator.rb b/tests/rspec/lib/name_generator.rb
@@ -42,6 +42,6 @@ def self.generate_fake_email
   end
 
   def self.generate_short_name
-    "rspec-#{Faker::Internet.user_name(5..8)}-#{Time.now.to_i}"
+    "rspec-#{Faker::Internet.user_name(5..8)}-#{SecureRandom.hex[0...RANDOM_HASH_LENGTH]}"
   end
 end