fix: Add teardown checks

features/stages.feature

@@ -38,6 +38,8 @@ Feature: Stage
         Then the "stage@simple_fail" stageBuild status is "FAILURE"
         And the "stage@simple_fail:teardown" job is triggered
         And the "target" job is not triggered
+        And the "stage@simple_fail:teardown" build succeeded
+        And the "stage@simple_fail" stageBuild status is "FAILURE"
 
     Scenario: Downstream builds within a stage are not triggered if upstream build in stage is not successful.
         Given an existing pipeline on branch "stageFail2" with the workflow jobs:
@@ -57,6 +59,8 @@ Feature: Stage
         And the "stage@incomplete_fail:teardown" job is triggered
         And the "c" job is not triggered
         And the "target" job is not triggered
+        And the "stage@incomplete_fail:teardown" build succeeded
+        And the "stage@incomplete_fail" stageBuild status is "FAILURE"
 
     Scenario: Downstream builds are triggered if required stage is successful.
         Given an existing pipeline on branch "stageSuccess1" with the workflow jobs:
@@ -78,3 +82,5 @@ Feature: Stage
         And the "stage@simple_success:teardown" job is triggered
         And the "target" job is triggered
         And the "target" build succeeded
+        And the "stage@simple_success:teardown" build succeeded
+        And the "stage@simple_success" stageBuild status is "SUCCESS"

features/step_definitions/stage.js

@@ -1,8 +1,7 @@
 'use strict';
 
 const Assert = require('chai').assert;
-const { Before, Given, When, Then } = require('@cucumber/cucumber');
-const request = require('screwdriver-request');
+const { Before, Given, Then } = require('@cucumber/cucumber');
 const sdapi = require('../support/sdapi');
 
 const TIMEOUT = 240 * 1000;

features/step_definitions/workflow.js

@@ -172,16 +172,14 @@ Then(
             config.desiredSha = this.sha;
         }
 
-        return sdapi
-            .searchForBuild(config)
-            .then(build => {
-                this.eventId = build.eventId;
-                const job = this.jobs.find(j => j.name === jobName);
+        return sdapi.searchForBuild(config).then(build => {
+            this.eventId = build.eventId;
+            const job = this.jobs.find(j => j.name === jobName);
 
-                Assert.equal(build.jobId, job.id);
+            Assert.equal(build.jobId, job.id);
 
-                this.buildId = build.id;
-            });
+            this.buildId = build.id;
+        });
     }
 );