fix: stabilize functional tests (#3212)

Author: VonnyJap

features/authorization.feature

@@ -1,5 +1,6 @@
 @auth
 @parallel
+@prod
 Feature: Authorization
 
     Another part of the developer's daily process is their constant interaction with GitHub. Their

features/events.feature

@@ -1,5 +1,6 @@
 @events
 @parallel
+@prod
 Feature: Events
 
     The most straight-forward change to a pipeline is by committing code. It has

features/trigger.feature

@@ -37,7 +37,6 @@ Feature: Remote Trigger
         And the "fail_A" build failed
         Then the "fail_B_prod" job on branch "pipelineB" is not triggered
 
-    @beta
     Scenario: External builds are not triggered if required build is not successful.
         Given an existing pipeline on branch "pipelineA" with job "fail_A"
         And an existing pipeline on branch "pipelineB" with the workflow jobs:
@@ -58,7 +57,6 @@ Feature: Remote Trigger
         Then the "success_B_or_prod" job on branch "pipelineB" is started
         And the "success_B_or_prod" build's parentBuildId on branch "pipelineB" is that "success_A" build's buildId
 
-    @beta
     Scenario: External build is triggered after another build is successful.
         Given an existing pipeline on branch "pipelineA" with job "success_A"
         And an existing pipeline on branch "pipelineB" with the workflow jobs:
@@ -80,7 +78,6 @@ Feature: Remote Trigger
         Then the "or_multiple_B_prod" job on branch "pipelineB" is started
         And the "or_multiple_B_prod" build's parentBuildId on branch "pipelineB" is that "success_A" build's buildId
 
-    @beta
     Scenario: External build is triggered after one of the builds is successful.
         Given an existing pipeline on branch "pipelineA" with job "success_A"
         And an existing pipeline on branch "pipelineB" with the workflow jobs:
@@ -104,7 +101,6 @@ Feature: Remote Trigger
         And the "success_B_and_prod" build's parentBuildId on branch "pipelineB" is that "success_A" build's buildId
 
     @ignore
-    @beta
     Scenario: External build which requires single AND trigger is triggered after another build is successful.
         Given an existing pipeline on branch "pipelineA" with job "success_A"
         And an existing pipeline on branch "pipelineB" with the workflow jobs:
@@ -129,7 +125,6 @@ Feature: Remote Trigger
         And the "parallel_B2" build's parentBuildId on branch "pipelineB" is that "parallel_A" build's buildId
         And builds for "parallel_B1" and "parallel_B2" jobs are part of a single event
 
-    @beta
     Scenario: Remote Join
         Given an existing pipeline on branch "beta-remote_join1" with the workflow jobs:
             | job       | requires                  |

package.json

@@ -10,12 +10,10 @@
     "start": "./bin/server",
     "debug": "node --nolazy ./bin/server",
     "profile": "node --prof ./bin/server",
-    "functional": "cucumber-js --format=progress --tags '(not @ignore) and (not @beta) and (not @x1) and (not @parallel)' --retry 2 --fail-fast --exit",
-    "functional-parallel": "cucumber-js --format=progress --tags '(not @ignore) and (not @beta) and (not @x1) and @parallel' --retry 2 --fail-fast --exit --parallel 7",
-    "functional-x1-parallel": "cucumber-js --format=progress --tags '(not @ignore) and (not @beta) and @x1 and @parallel' --retry 2 --fail-fast --exit --parallel 7",
+    "functional": "cucumber-js --format=progress --tags '(not @ignore) and @prod' --retry 2 --fail-fast --exit",
     "functional-beta": "cucumber-js --format=progress --tags '(not @ignore) and (not @prod) and (not @x1) and (not @parallel)' --retry 2 --fail-fast --exit",
-    "functional-beta-parallel": "cucumber-js --format=progress --tags '(not @ignore) and (not @prod) and (not @x1) and @parallel' --retry 2 --fail-fast --exit --parallel 7",
-    "functional-beta-x1-parallel": "cucumber-js --format=progress --tags '(not @ignore) and (not @prod) and @x1 and @parallel' --retry 2 --fail-fast --exit --parallel 7",
+    "functional-beta-parallel": "cucumber-js --format=progress --tags '(not @ignore) and (not @prod) and (not @x1) and @parallel' --retry 2 --fail-fast --exit --parallel 4",
+    "functional-beta-x1-parallel": "cucumber-js --format=progress --tags '(not @ignore) and (not @prod) and @x1 and @parallel' --retry 2 --fail-fast --exit --parallel 4",
     "functional-dev": "cucumber-js --format=progress --tags '(not @ignore) and (not @prod)' --retry 2 --fail-fast --exit",
     "create-test-user": "node -e 'require(\"./features/scripts/create-test-user.js\")()'",
     "diagrams": "find ./design/diagrams -type f -name \\*.puml -print0 | xargs -0 -n 1 -I DIAGRAM puml generate DIAGRAM -o DIAGRAM.png",
@@ -164,4 +162,4 @@
     "sinon": "^15.0.0",
     "stream-to-promise": "^3.0.0"
   }
-}
+}

screwdriver.yaml

@@ -95,9 +95,7 @@ jobs:
             - wait-docker: DOCKER_TAG=`meta get docker_tag` ./ci/docker-wait.sh
             - deploy-k8s: K8S_TAG=`meta get docker_tag` ./ci/k8s-deploy.sh
             - npm-install: npm install
-            - test: GIT_TOKEN=${GIT_TOKEN_PROD} SD_API_TOKEN=${SD_API_TOKEN_PROD} npm run functional
-            - test-parallel: GIT_TOKEN=${GIT_TOKEN_PROD} SD_API_TOKEN=${SD_API_TOKEN_PROD} npm run functional-parallel
-            - test-x1-parallel: TEST_USERNAME=${TEST_USERNAME_X1} GIT_TOKEN=${GIT_TOKEN_X1} SD_API_TOKEN=${SD_API_TOKEN_PROD_X1} npm run functional-x1-parallel
+            - test: TEST_USERNAME=${TEST_USERNAME_X1} GIT_TOKEN=${GIT_TOKEN_X1} SD_API_TOKEN=${SD_API_TOKEN_PROD_X1} npm run functional
         environment:
             K8S_CONTAINER: screwdriver-api
             K8S_IMAGE: screwdrivercd/screwdriver