diff --git a/Jenkinsfile b/Jenkinsfile index 0b2e1cb123..59b716eb68 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,7 +108,7 @@ pipeline { stage ('2: run second test suite') { steps { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh script: "make -j$NPROC kind/retest TESTS=[bulk-deployment,gitlab,github,bitbucket,python,node-mongodb,elasticsearch,image-cache] BRANCH_NAME=${SAFEBRANCH_NAME}", label: "Running second test suite on kind cluster" + sh script: "make -j$NPROC kind/retest TESTS=[bulk-deployment,gitlab,github,bitbucket,python,node-mongodb,elasticsearch,image-cache,workflows] BRANCH_NAME=${SAFEBRANCH_NAME}", label: "Running second test suite on kind cluster" } sh script: "pkill -f './local-dev/stern'", label: "Closing off test-suite-2 log after test completion" } diff --git a/Makefile b/Makefile index 00fa03d426..a28502930e 100644 --- a/Makefile +++ b/Makefile @@ -515,7 +515,7 @@ STERN_VERSION = 2.1.17 CHART_TESTING_VERSION = v3.4.0 KIND_IMAGE = kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6 TESTS = [nginx,api,features-kubernetes,bulk-deployment,features-kubernetes-2,features-api-variables,active-standby-kubernetes,tasks,drush,drupal-php80,drupal-postgres,python,gitlab,github,bitbucket,node-mongodb,elasticsearch,workflows] -CHARTS_TREEISH = "feature/workflows" +CHARTS_TREEISH = "main" # Symlink the installed kubectl client if the correct version is already # installed, otherwise downloads it. diff --git a/tests/tests/tasks/post-api-register-task-command.yaml b/tests/tests/tasks/post-api-register-task-command.yaml index adbcabed87..a76cf99a86 100644 --- a/tests/tests/tasks/post-api-register-task-command.yaml +++ b/tests/tests/tasks/post-api-register-task-command.yaml @@ -4,6 +4,7 @@ - name: Set the retry count set_fact: retry_count: "{{ 0 if retry_count is undefined else retry_count|int + 1 }}" + r: "{{ 100 | random }}" - name: "{{ testname }} - POST api register task definition to {{ graphql_url }}" uri: url: "{{ graphql_url }}" @@ -11,7 +12,7 @@ headers: Authorization: "Bearer {{ admin_token }}" body_format: json - body: '{ "query": "mutation($environmentId: Int!, $taskName: String!, $description: String!, $service: String!, $command: String!, $varname: String!) {addAdvancedTaskDefinition(input: {environment:$environmentId, name:$taskName, type:COMMAND, description: $description, service: $service, advancedTaskDefinitionArguments: [{name: $varname, type:STRING}], command: $command}){... on AdvancedTaskDefinitionCommand {id}}}", "variables": {"environmentId": {{ environmentByOSProjectNameApiResponse.json.data.environmentByOpenshiftProjectName.id }}, "taskName":"testing-echo","description":"echos to file", "service":"node", "command":"echo $ENV_VAR_TEXT_STRING > /app/files/testoutput.txt", "varname": "ENV_VAR_TEXT_STRING"}}' + body: '{ "query": "mutation($environmentId: Int!, $taskName: String!, $description: String!, $service: String!, $command: String!, $varname: String!) {addAdvancedTaskDefinition(input: {environment:$environmentId, name:$taskName, type:COMMAND, description: $description, service: $service, advancedTaskDefinitionArguments: [{name: $varname, type:STRING}], command: $command}){... on AdvancedTaskDefinitionCommand {id}}}", "variables": {"environmentId": {{ environmentByOSProjectNameApiResponse.json.data.environmentByOpenshiftProjectName.id }}, "taskName":"testing-echo-tasks-{{ r }}","description":"echos to file", "service":"node", "command":"echo $ENV_VAR_TEXT_STRING > /app/files/testoutput.txt", "varname": "ENV_VAR_TEXT_STRING"}}' register: taskCreateApiResponse rescue: - debug: diff --git a/tests/tests/workflows/post-api-register-task-command.yaml b/tests/tests/workflows/post-api-register-task-command.yaml index 3affa88dd6..260a031762 100644 --- a/tests/tests/workflows/post-api-register-task-command.yaml +++ b/tests/tests/workflows/post-api-register-task-command.yaml @@ -4,6 +4,7 @@ - name: Set the retry count set_fact: retry_count: "{{ 0 if retry_count is undefined else retry_count|int + 1 }}" + r: "{{ 100 | random }}" - name: "{{ testname }} - POST api register task definition to {{ graphql_url }}" uri: url: "{{ graphql_url }}" @@ -11,7 +12,7 @@ headers: Authorization: "Bearer {{ admin_token }}" body_format: json - body: '{ "query": "mutation($environmentId: Int!, $taskName: String!, $description: String!, $service: String!, $command: String!) {addAdvancedTaskDefinition(input: {environment:$environmentId, name:$taskName, type:COMMAND, description: $description, service: $service, command: $command}){... on AdvancedTaskDefinitionCommand {id}}}", "variables": {"environmentId": {{ environmentByOSProjectNameApiResponse.json.data.environmentByOpenshiftProjectName.id }}, "taskName":"testing-echo","description":"echos to file", "service":"node", "command":"echo ''REPLACED BY TASK'' > /app/files/testoutput.txt"}}' + body: '{ "query": "mutation($environmentId: Int!, $taskName: String!, $description: String!, $service: String!, $command: String!) {addAdvancedTaskDefinition(input: {environment:$environmentId, name:$taskName, type:COMMAND, description: $description, service: $service, command: $command}){... on AdvancedTaskDefinitionCommand {id}}}", "variables": {"environmentId": {{ environmentByOSProjectNameApiResponse.json.data.environmentByOpenshiftProjectName.id }}, "taskName":"testing-echo-workflows-{{ r }}","description":"echos to file", "service":"node", "command":"echo ''REPLACED BY TASK'' > /app/files/testoutput.txt"}}' register: taskCreateApiResponse rescue: - debug: