fix: use another headless user x1 to run func tests against prod (#3208)

Author: VonnyJap

package.json

@@ -10,8 +10,9 @@
     "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 @parallel)' --retry 2 --fail-fast --exit",
-    "functional-parallel": "cucumber-js --format=progress --tags '(not @ignore) and (not @beta) and @parallel' --retry 2 --fail-fast --exit --parallel 7",
+    "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-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",

screwdriver.yaml

@@ -64,7 +64,7 @@ jobs:
             K8S_ENV_KEY: DATASTORE_DYNAMODB_PREFIX
             K8S_ENV_VALUE: beta_rc2_
             TEST_USERNAME: sd-buildbot-functional
-            TEST_USERNAME_X1: sd-buildbot-functional-beta-X1
+            TEST_USERNAME_X1: sd-buildbot-functional-X1
             TEST_ORG: screwdriver-cd-test
         secrets:
             # Access key for functional tests
@@ -74,7 +74,7 @@ jobs:
             # Access key for functional tests
             - SD_API_TOKEN_BETA_X1
             # Git access token
-            - GIT_TOKEN_BETA_X1
+            - GIT_TOKEN_X1
             # Talking to Kubernetes
             - K8S_TOKEN
         steps:
@@ -84,7 +84,7 @@ jobs:
             - npm-install: npm install
             - test: GIT_TOKEN=${GIT_TOKEN_BETA} SD_API_TOKEN=${SD_API_TOKEN_BETA} npm run functional-beta
             - test-parallel: GIT_TOKEN=${GIT_TOKEN_BETA} SD_API_TOKEN=${SD_API_TOKEN_BETA} npm run functional-beta-parallel
-            - test-x1-parallel: TEST_USERNAME=${TEST_USERNAME_X1} GIT_TOKEN=${GIT_TOKEN_BETA_X1} SD_API_TOKEN=${SD_API_TOKEN_BETA_X1} npm run functional-beta-x1-parallel
+            - test-x1-parallel: TEST_USERNAME=${TEST_USERNAME_X1} GIT_TOKEN=${GIT_TOKEN_X1} SD_API_TOKEN=${SD_API_TOKEN_BETA_X1} npm run functional-beta-x1-parallel
 
     # Deploy to our prod environment and run tests
     prod:
@@ -97,6 +97,7 @@ jobs:
             - 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
         environment:
             K8S_CONTAINER: screwdriver-api
             K8S_IMAGE: screwdrivercd/screwdriver
@@ -106,11 +107,16 @@ jobs:
             K8S_ENV_KEY: DATASTORE_DYNAMODB_PREFIX
             K8S_ENV_VALUE: rc2_
             TEST_USERNAME: sd-buildbot-functional
+            TEST_USERNAME_X1: sd-buildbot-functional-X1
             TEST_ORG: screwdriver-cd-test
         secrets:
             # Access key for functional tests
             - SD_API_TOKEN_PROD
             # Git access token
             - GIT_TOKEN_PROD
             # Talking to Kubernetes
-            - K8S_TOKEN
+            - K8S_TOKEN
+            # Access key for functional tests
+            - SD_API_TOKEN_PROD_X1
+            # Git access token
+            - GIT_TOKEN_X1