From 6118e6a530eca5e57a947ccb66697e07b7022825 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Wed, 17 Feb 2021 13:08:59 +0100
Subject: [PATCH] Jenkinsfile: use less steps

---
 Jenkinsfile | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d3de0bc..c532fb5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,8 +5,10 @@ pipeline {
             steps {
                 sh """
                     [ -d venv ] && rm -rf venv
+
                     virtualenv -p python3 venv
                     . venv/bin/activate
+
                     pip install --upgrade pip
                     pip install -r requirements.txt
                 """
@@ -14,47 +16,28 @@ pipeline {
         }
         stage('bw test') {
             parallel {
-                stage('determinism') {
+                stage('config and metadata determinism') {
                     steps {
                         sh """
                             . venv/bin/activate
+
                             export BW_VAULT_DUMMY_MODE=1
                             bw test --metadata-determinism 3 --config-determinism 3
                         """
                     }
                 }
-                stage('ignore missing vaults') {
+                stage('other tests') {
                     steps {
                         sh """
                             . venv/bin/activate
+
                             bw test --ignore-missing-faults
-                        """
-                    }
-                }
-                stage('dummy mode') {
-                    when {
-                        branch 'main'
-                    }
-                    steps {
-                        sh """
-                            . venv/bin/activate
+
                             export BW_VAULT_DUMMY_MODE=1
                             bw test
                         """
                     }
                 }
-                stage('reactor.provides') {
-                    when {
-                        branch 'main'
-                    }
-                    steps {
-                        sh """
-                            . venv/bin/activate
-                            export BW_VAULT_DUMMY_MODE=1
-                            bw test -p
-                        """
-                    }
-                }
             }
         }
     }