Merge branch 'fix-test-collection-config' into 'master'

Fix test collection config

See merge request !57

generate-pipeline.py

@@ -45,11 +45,20 @@ with open('test-execution.gitlab-ci.yml', 'w') as pipelineConfig:
 		'    name: postman/newman_alpine33',
 		'    entrypoint: [""]',
 		'  script:',
+		'    - TEST_COLLECTION_CONFIG=$(eval echo \$$TEST_COLLECTION_CONFIG_VARNAME)',
+		'    - |',
+		'      test -f "$TEST_COLLECTION_CONFIG" || ((',
+		'        echo TEST_COLLECTION_CONFIG does not appear to be a file.',
+		'        echo This probably means that you are running on a non-protected branch and did not',
+		'        echo provide the deployment secrets manually. Or it could be a misconfigured variable.',
+		'        echo',
+		'        echo Warning: I am intentionally not printing the value of the variable in case it is the secret content itself.',
+		'      ) && false)',
 		'    - newman --version ',
-		'#    - npm install -g newman-reporter-html',
-		'#    - npm install -g newman-reporter-htmlextra',
-		'#    - newman run "$COLLECTION_JSON" -e "$ENVIRONMENT" -d "$' + platform.upper()  + '_TEST_COLLECTION_CONFIG" --reporters cli,htmlextra,junit --reporter-htmlextra-export "$HTML_REPORT_NAME" --reporter-junit-export "$JUNIT_REPORT_NAME"',
-		'    - newman run "$COLLECTION_JSON" -e "$ENVIRONMENT" -d "$' + platform.upper()  + '_TEST_COLLECTION_CONFIG" --reporters cli',
+		#'    - npm install -g newman-reporter-html',
+		#'    - npm install -g newman-reporter-htmlextra',
+		#'    - newman run "$COLLECTION_JSON" -e "$ENVIRONMENT" -d "$TEST_COLLECTION_CONFIG" --reporters cli,htmlextra,junit --reporter-htmlextra-export "$HTML_REPORT_NAME" --reporter-junit-export "$JUNIT_REPORT_NAME"',
+		'    - newman run "$COLLECTION_JSON" -e "$ENVIRONMENT" -d "$TEST_COLLECTION_CONFIG" --reporters cli',
 		''
 	]))
 
@@ -76,6 +85,7 @@ with open('test-execution.gitlab-ci.yml', 'w') as pipelineConfig:
 				'  needs: []',
 				'  variables:',
 				'    ENVIRONMENT: "' + environ['path'] + '"',
+				'    TEST_COLLECTION_CONFIG_VARNAME: ' + platform.upper() + '_TEST_COLLECTION_CONFIG',
 				'    COLLECTION_JSON: "' + collect['path'] + '"',
 				'    HTML_REPORT_NAME: "' + htmlReportName + '"',
 				'    JUNIT_REPORT_NAME: "' + junitReportName + '"'