From 63b486a57d8040552a3413f5bc90be68c0a2700d Mon Sep 17 00:00:00 2001 From: Shrikant Garg Date: Tue, 8 Sep 2020 08:15:49 -0400 Subject: [PATCH 1/8] Update ibm.yml --- cloud-providers/ibm.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cloud-providers/ibm.yml b/cloud-providers/ibm.yml index 0aa029a1..30b124b1 100644 --- a/cloud-providers/ibm.yml +++ b/cloud-providers/ibm.yml @@ -89,6 +89,10 @@ ibm-deploy: VENDOR: ibm HOST: $IBM_SCHEMA_HOST + # Workflow + FINISHED_WORKFLOW_ID: $FINISHED_WORKFLOW_ID + WORKFLOW_HOST: $WORKFLOW_HOST + ibm-test: stage: integration needs: ["ibm-deploy"] -- GitLab From 9ec0c5006d733fcbb3fbed7dc50c5c2b1f62293c Mon Sep 17 00:00:00 2001 From: Shrikant Garg Date: Wed, 9 Sep 2020 07:39:37 -0400 Subject: [PATCH 2/8] Update ibm.yml --- cloud-providers/ibm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud-providers/ibm.yml b/cloud-providers/ibm.yml index 30b124b1..194c5795 100644 --- a/cloud-providers/ibm.yml +++ b/cloud-providers/ibm.yml @@ -90,8 +90,8 @@ ibm-deploy: HOST: $IBM_SCHEMA_HOST # Workflow - FINISHED_WORKFLOW_ID: $FINISHED_WORKFLOW_ID - WORKFLOW_HOST: $WORKFLOW_HOST + FINISHED_WORKFLOW_ID: $IBM_FINISHED_WORKFLOW_ID + WORKFLOW_HOST: $IBM_WORKFLOW_HOST ibm-test: stage: integration -- GitLab From d1a28b95be1c3a024d375596012d985bc534c3c4 Mon Sep 17 00:00:00 2001 From: shrikgar Date: Thu, 10 Sep 2020 11:08:07 +0530 Subject: [PATCH 3/8] added harcoded value to test --- cloud-providers/ibm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud-providers/ibm.yml b/cloud-providers/ibm.yml index 194c5795..e538d76b 100644 --- a/cloud-providers/ibm.yml +++ b/cloud-providers/ibm.yml @@ -91,7 +91,7 @@ ibm-deploy: # Workflow FINISHED_WORKFLOW_ID: $IBM_FINISHED_WORKFLOW_ID - WORKFLOW_HOST: $IBM_WORKFLOW_HOST + WORKFLOW_HOST: https://workflow-og-cicd.osdu-qa-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud ibm-test: stage: integration -- GitLab From 3d0278114dba44296f98846ea3c022c8f6aa3d25 Mon Sep 17 00:00:00 2001 From: shrikgar Date: Thu, 10 Sep 2020 11:32:24 +0530 Subject: [PATCH 4/8] added harcoded value to test --- cloud-providers/ibm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud-providers/ibm.yml b/cloud-providers/ibm.yml index e538d76b..48e48cd7 100644 --- a/cloud-providers/ibm.yml +++ b/cloud-providers/ibm.yml @@ -91,7 +91,7 @@ ibm-deploy: # Workflow FINISHED_WORKFLOW_ID: $IBM_FINISHED_WORKFLOW_ID - WORKFLOW_HOST: https://workflow-og-cicd.osdu-qa-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud + WORKFLOW_HOST: https://workflow-og-cicd.osdu-qa-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/workflow/v1 ibm-test: stage: integration -- GitLab From d3cad65205b4d0c3a368a2f12bf3141c1bcb621e Mon Sep 17 00:00:00 2001 From: shrikgar Date: Thu, 10 Sep 2020 12:19:47 +0530 Subject: [PATCH 5/8] added harcoded value to test --- cloud-providers/ibm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud-providers/ibm.yml b/cloud-providers/ibm.yml index 48e48cd7..c8ba13cf 100644 --- a/cloud-providers/ibm.yml +++ b/cloud-providers/ibm.yml @@ -91,7 +91,7 @@ ibm-deploy: # Workflow FINISHED_WORKFLOW_ID: $IBM_FINISHED_WORKFLOW_ID - WORKFLOW_HOST: https://workflow-og-cicd.osdu-qa-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/workflow/v1 + WORKFLOW_HOST: 'https://workflow-og-cicd.osdu-qa-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/workflow/v1' ibm-test: stage: integration -- GitLab From 16b86de1971e2bd3223feb75b1ee17dc1efd37c0 Mon Sep 17 00:00:00 2001 From: shrikgar Date: Thu, 10 Sep 2020 12:51:40 +0530 Subject: [PATCH 6/8] added harcoded value to test --- cloud-providers/ibm.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/cloud-providers/ibm.yml b/cloud-providers/ibm.yml index c8ba13cf..275eba06 100644 --- a/cloud-providers/ibm.yml +++ b/cloud-providers/ibm.yml @@ -100,6 +100,7 @@ ibm-test: - .maven - .ibm_variables script: + - echo $WORKFLOW_HOST - if [[ $IBM_INT_TEST_SUBDIR == *"ibm"* ]]; then $MAVEN install -f ${IBM_INT_TEST_SUBDIR/ibm/core}/pom.xml -DskipTests=true; fi - export TEST_CMD=${IBM_TEST_CMD:-test} - $MAVEN $TEST_CMD -q -f $IBM_INT_TEST_SUBDIR/pom.xml > test-results.log -- GitLab From 05cb15088c5e8936391041da80c6ad0d1cfa0d13 Mon Sep 17 00:00:00 2001 From: shrikgar Date: Thu, 10 Sep 2020 13:17:10 +0530 Subject: [PATCH 7/8] added harcoded value to test --- cloud-providers/ibm.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cloud-providers/ibm.yml b/cloud-providers/ibm.yml index 275eba06..980f2339 100644 --- a/cloud-providers/ibm.yml +++ b/cloud-providers/ibm.yml @@ -92,6 +92,9 @@ ibm-deploy: # Workflow FINISHED_WORKFLOW_ID: $IBM_FINISHED_WORKFLOW_ID WORKFLOW_HOST: 'https://workflow-og-cicd.osdu-qa-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/workflow/v1' + IBM_WORKFLOW_HOST: 'https://workflow-og-cicd.osdu-qa-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/workflow/v1' + IBM_FINISHED_WORKFLOW_ID: $IBM_FINISHED_WORKFLOW_ID + ibm-test: stage: integration -- GitLab From 7a8851511da490adef5ebc43aae395d9cbc25438 Mon Sep 17 00:00:00 2001 From: shrikgar Date: Thu, 10 Sep 2020 22:26:21 +0530 Subject: [PATCH 8/8] added for ibm workflow service --- cloud-providers/ibm.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cloud-providers/ibm.yml b/cloud-providers/ibm.yml index 980f2339..058b5cb2 100644 --- a/cloud-providers/ibm.yml +++ b/cloud-providers/ibm.yml @@ -91,9 +91,7 @@ ibm-deploy: # Workflow FINISHED_WORKFLOW_ID: $IBM_FINISHED_WORKFLOW_ID - WORKFLOW_HOST: 'https://workflow-og-cicd.osdu-qa-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/workflow/v1' - IBM_WORKFLOW_HOST: 'https://workflow-og-cicd.osdu-qa-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/workflow/v1' - IBM_FINISHED_WORKFLOW_ID: $IBM_FINISHED_WORKFLOW_ID + WORKFLOW_HOST: $IBM_WORKFLOW_HOST ibm-test: @@ -103,7 +101,6 @@ ibm-test: - .maven - .ibm_variables script: - - echo $WORKFLOW_HOST - if [[ $IBM_INT_TEST_SUBDIR == *"ibm"* ]]; then $MAVEN install -f ${IBM_INT_TEST_SUBDIR/ibm/core}/pom.xml -DskipTests=true; fi - export TEST_CMD=${IBM_TEST_CMD:-test} - $MAVEN $TEST_CMD -q -f $IBM_INT_TEST_SUBDIR/pom.xml > test-results.log -- GitLab