From 3614d9e7dfa24a6832cf8edb3bbd8fa728cdec68 Mon Sep 17 00:00:00 2001 From: gohilamariappan <41056032+gohilamariappan@users.noreply.github.com> Date: Fri, 2 Sep 2022 17:58:37 +0530 Subject: [PATCH 01/34] commented root -org creation for test --- ansible/roles/post-install/tasks/main.yml | 52 +++++++++++------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index 121e4d0653..8584952fea 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -16,32 +16,32 @@ - debug: var: keycloak_access_token -- name: Creating root org - block: - - uri: - url: "https://{{ domain_name }}/api/org/v1/create" - method: POST - headers: - x-authenticated-user-token: "{{ keycloak_access_token }}" - Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" - body_format: json - body: |- - { - "request": { - "orgName": "Sunbird", - "channel": "{{ sunbird_default_channel }}", - "description": "Default Channel", - "isTenant": true, - "organisationType":"board" - } - } - register: custodian_org_output - - debug: - var: custodian_org_output - - set_fact: - sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" - - debug: - var: sunbird_custodian_org_id +#- name: Creating root org +# block: + # - uri: + # url: "https://{{ domain_name }}/api/org/v1/create" + # method: POST + # headers: + # x-authenticated-user-token: "{{ keycloak_access_token }}" + # Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" + # body_format: json + # body: |- + # { + # "request": { + # "orgName": "Sunbird", + # "channel": "{{ sunbird_default_channel }}", + # "description": "Default Channel", + # "isTenant": true, + # "organisationType":"board" + # } + # } + # register: custodian_org_output +# - debug: + # var: custodian_org_output + # - set_fact: + # sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" + #- debug: + # var: sunbird_custodian_org_id # Else login won't work - name: Creating NTP org for login From 20f22c148c3d91dc73f9f5da16096cad508bb215 Mon Sep 17 00:00:00 2001 From: gohilamariappan <41056032+gohilamariappan@users.noreply.github.com> Date: Fri, 2 Sep 2022 17:59:48 +0530 Subject: [PATCH 02/34] tags removed in jenkinsfile for 4.3.0 post install --- kubernetes/pipelines/post-install/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/pipelines/post-install/Jenkinsfile b/kubernetes/pipelines/post-install/Jenkinsfile index deda3ff045..c67cc7a21b 100644 --- a/kubernetes/pipelines/post-install/Jenkinsfile +++ b/kubernetes/pipelines/post-install/Jenkinsfile @@ -24,7 +24,7 @@ node() { jobName = sh(returnStdout: true, script: "echo $JOB_NAME").split('/')[-1].trim().toLowerCase() currentWs = sh(returnStdout: true, script: 'pwd').trim() ansiblePlaybook = "$currentWs/ansible/post-install.yaml" - ansibleExtraArgs = "--vault-password-file /var/lib/jenkins/secrets/vault-pass --tags ${params.tag} -v" + ansibleExtraArgs = "--vault-password-file /var/lib/jenkins/secrets/vault-pass -v" values.put('currentWs', currentWs) values.put('env', envDir) values.put('module', module) From 28e78311a05d48b9db9e0f22feced5884a49c155 Mon Sep 17 00:00:00 2001 From: gohilamariappan <41056032+gohilamariappan@users.noreply.github.com> Date: Mon, 12 Sep 2022 17:23:12 +0530 Subject: [PATCH 03/34] channel name updated --- ansible/roles/post-install/tasks/main.yml | 54 +++++++++++------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index 8584952fea..4e2422be2e 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -16,32 +16,32 @@ - debug: var: keycloak_access_token -#- name: Creating root org -# block: - # - uri: - # url: "https://{{ domain_name }}/api/org/v1/create" - # method: POST - # headers: - # x-authenticated-user-token: "{{ keycloak_access_token }}" - # Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" - # body_format: json - # body: |- - # { - # "request": { - # "orgName": "Sunbird", - # "channel": "{{ sunbird_default_channel }}", - # "description": "Default Channel", - # "isTenant": true, - # "organisationType":"board" - # } - # } - # register: custodian_org_output -# - debug: - # var: custodian_org_output - # - set_fact: - # sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" - #- debug: - # var: sunbird_custodian_org_id +- name: Creating root org + block: + - uri: + url: "https://{{ domain_name }}/api/org/v1/create" + method: POST + headers: + x-authenticated-user-token: "{{ keycloak_access_token }}" + Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" + body_format: json + body: |- + { + "request": { + "orgName": "Sunbird", + "channel": "{{ sunbird_default_channel }}", + "description": "Default Channel", + "isTenant": true, + "organisationType":"board" + } + } + register: custodian_org_output + - debug: + var: custodian_org_output + - set_fact: + sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" + - debug: + var: sunbird_custodian_org_id # Else login won't work - name: Creating NTP org for login @@ -59,7 +59,7 @@ "orgName":"NTP", "description":"NTP Organisation for Sunbird", "isRootOrg": true, - "channel": "ntp", + "channel": "ntpsunbird", "organisationType": "board", "isTenant": true } From 9bfdb3a4e32fcbb59e041c4037aa83bff09bad35 Mon Sep 17 00:00:00 2001 From: gohilamariappan <41056032+gohilamariappan@users.noreply.github.com> Date: Tue, 13 Sep 2022 10:58:07 +0530 Subject: [PATCH 04/34] updated yaml for test --- ansible/roles/post-install/tasks/main.yml | 100 +++++++++++----------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index 4e2422be2e..e0e08b9ef3 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -16,55 +16,55 @@ - debug: var: keycloak_access_token -- name: Creating root org - block: - - uri: - url: "https://{{ domain_name }}/api/org/v1/create" - method: POST - headers: - x-authenticated-user-token: "{{ keycloak_access_token }}" - Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" - body_format: json - body: |- - { - "request": { - "orgName": "Sunbird", - "channel": "{{ sunbird_default_channel }}", - "description": "Default Channel", - "isTenant": true, - "organisationType":"board" - } - } - register: custodian_org_output - - debug: - var: custodian_org_output - - set_fact: - sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" - - debug: - var: sunbird_custodian_org_id +# - name: Creating root org +# block: +# - uri: +# url: "https://{{ domain_name }}/api/org/v1/create" +# method: POST +# headers: +# x-authenticated-user-token: "{{ keycloak_access_token }}" +# Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" +# body_format: json +# body: |- +# { +# "request": { +# "orgName": "Sunbird", +# "channel": "{{ sunbird_default_channel }}", +# "description": "Default Channel", +# "isTenant": true, +# "organisationType":"board" +# } +# } +# register: custodian_org_output +# - debug: +# var: custodian_org_output +# - set_fact: +# sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" +# - debug: +# var: sunbird_custodian_org_id -# Else login won't work -- name: Creating NTP org for login - block: - - uri: - url: "https://{{ domain_name }}/api/org/v1/create" - method: POST - headers: - x-authenticated-user-token: "{{ keycloak_access_token }}" - Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" - body_format: json - body: |- - { - "request": { - "orgName":"NTP", - "description":"NTP Organisation for Sunbird", - "isRootOrg": true, - "channel": "ntpsunbird", - "organisationType": "board", - "isTenant": true - } - } +# # Else login won't work +# - name: Creating NTP org for login +# block: +# - uri: +# url: "https://{{ domain_name }}/api/org/v1/create" +# method: POST +# headers: +# x-authenticated-user-token: "{{ keycloak_access_token }}" +# Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" +# body_format: json +# body: |- +# { +# "request": { +# "orgName":"NTP", +# "description":"NTP Organisation for Sunbird", +# "isRootOrg": true, +# "channel": "ntpsunbird", +# "organisationType": "board", +# "isTenant": true +# } +# } -# - import_tasks: knowledge_platform_tasks.yaml -# - import_tasks: user_org.yaml -# - import_tasks: forms.yaml + - import_tasks: knowledge_platform_tasks.yaml + - import_tasks: user_org.yaml + - import_tasks: forms.yaml From c351caccaa67bf105ce929d2b29c2ee7537473c9 Mon Sep 17 00:00:00 2001 From: gohilamariappan <41056032+gohilamariappan@users.noreply.github.com> Date: Tue, 13 Sep 2022 11:02:51 +0530 Subject: [PATCH 05/34] syntax test --- ansible/roles/post-install/tasks/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index e0e08b9ef3..aa0642d0df 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -65,6 +65,7 @@ # } # } - - import_tasks: knowledge_platform_tasks.yaml - - import_tasks: user_org.yaml - - import_tasks: forms.yaml + +- import_tasks: knowledge_platform_tasks.yaml +- import_tasks: user_org.yaml +- import_tasks: forms.yaml From 77648387d364a3b0bf42eadc31b31519637f64aa Mon Sep 17 00:00:00 2001 From: gohilamariappan <41056032+gohilamariappan@users.noreply.github.com> Date: Tue, 13 Sep 2022 11:16:58 +0530 Subject: [PATCH 06/34] test --- ansible/roles/post-install/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index aa0642d0df..7c40b18cd5 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -66,6 +66,6 @@ # } -- import_tasks: knowledge_platform_tasks.yaml +#- import_tasks: knowledge_platform_tasks.yaml - import_tasks: user_org.yaml - import_tasks: forms.yaml From 66071e1ac54e233fb50c652e75008c440d8e5913 Mon Sep 17 00:00:00 2001 From: gohilamariappan <41056032+gohilamariappan@users.noreply.github.com> Date: Tue, 13 Sep 2022 11:41:15 +0530 Subject: [PATCH 07/34] user-org updated --- ansible/roles/post-install/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index 7c40b18cd5..3ed00aa1e2 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -67,5 +67,5 @@ #- import_tasks: knowledge_platform_tasks.yaml -- import_tasks: user_org.yaml +#- import_tasks: user_org.yaml - import_tasks: forms.yaml From 1747da983f4e6279735ba274889c5b2eec5f3019 Mon Sep 17 00:00:00 2001 From: Haritest Date: Thu, 15 Sep 2022 11:49:02 +0530 Subject: [PATCH 08/34] Update main.yml --- ansible/roles/post-install/tasks/main.yml | 94 +++++++++++------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index 3ed00aa1e2..35100e0fd5 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -16,56 +16,56 @@ - debug: var: keycloak_access_token -# - name: Creating root org -# block: -# - uri: -# url: "https://{{ domain_name }}/api/org/v1/create" -# method: POST -# headers: -# x-authenticated-user-token: "{{ keycloak_access_token }}" -# Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" -# body_format: json -# body: |- -# { -# "request": { -# "orgName": "Sunbird", -# "channel": "{{ sunbird_default_channel }}", -# "description": "Default Channel", -# "isTenant": true, -# "organisationType":"board" -# } -# } -# register: custodian_org_output -# - debug: -# var: custodian_org_output -# - set_fact: -# sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" -# - debug: -# var: sunbird_custodian_org_id + - name: Creating root org + block: + - uri: + url: "https://{{ domain_name }}/api/org/v1/create" + method: POST + headers: + x-authenticated-user-token: "{{ keycloak_access_token }}" + Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" + body_format: json + body: |- + { + "request": { + "orgName": "Sunbird", + "channel": "{{ sunbird_default_channel }}", + "description": "Default Channel", + "isTenant": true, + "organisationType":"board" + } + } + register: custodian_org_output + - debug: + var: custodian_org_output + - set_fact: + sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" + - debug: + var: sunbird_custodian_org_id # # Else login won't work -# - name: Creating NTP org for login -# block: -# - uri: -# url: "https://{{ domain_name }}/api/org/v1/create" -# method: POST -# headers: -# x-authenticated-user-token: "{{ keycloak_access_token }}" -# Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" -# body_format: json -# body: |- -# { -# "request": { -# "orgName":"NTP", -# "description":"NTP Organisation for Sunbird", -# "isRootOrg": true, -# "channel": "ntpsunbird", -# "organisationType": "board", -# "isTenant": true -# } -# } + - name: Creating NTP org for login + block: + - uri: + url: "https://{{ domain_name }}/api/org/v1/create" + method: POST + headers: + x-authenticated-user-token: "{{ keycloak_access_token }}" + Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" + body_format: json + body: |- + { + "request": { + "orgName":"NTP", + "description":"NTP Organisation for Sunbird", + "isRootOrg": true, + "channel": "ntp", + "organisationType": "board", + "isTenant": true + } + } #- import_tasks: knowledge_platform_tasks.yaml #- import_tasks: user_org.yaml -- import_tasks: forms.yaml +#- import_tasks: forms.yaml From e6c19fb4dce2e523c79967c878c49b3912cf259e Mon Sep 17 00:00:00 2001 From: Haritest Date: Thu, 15 Sep 2022 11:56:16 +0530 Subject: [PATCH 09/34] Update main.yml --- ansible/roles/post-install/tasks/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index 35100e0fd5..35b064ab40 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -16,9 +16,9 @@ - debug: var: keycloak_access_token - - name: Creating root org - block: - - uri: + - name: Creating root org + block: + - uri: url: "https://{{ domain_name }}/api/org/v1/create" method: POST headers: @@ -44,9 +44,9 @@ var: sunbird_custodian_org_id # # Else login won't work - - name: Creating NTP org for login - block: - - uri: + - name: Creating NTP org for login + block: + - uri: url: "https://{{ domain_name }}/api/org/v1/create" method: POST headers: From 7f44a147911d72ec37b1ffb69d08d30e59ad2d8f Mon Sep 17 00:00:00 2001 From: Haritest Date: Thu, 15 Sep 2022 11:57:58 +0530 Subject: [PATCH 10/34] Update main.yml --- ansible/roles/post-install/tasks/main.yml | 101 +++++++++++----------- 1 file changed, 50 insertions(+), 51 deletions(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index 35b064ab40..121e4d0653 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -16,56 +16,55 @@ - debug: var: keycloak_access_token - - name: Creating root org - block: - - uri: - url: "https://{{ domain_name }}/api/org/v1/create" - method: POST - headers: - x-authenticated-user-token: "{{ keycloak_access_token }}" - Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" - body_format: json - body: |- - { - "request": { - "orgName": "Sunbird", - "channel": "{{ sunbird_default_channel }}", - "description": "Default Channel", - "isTenant": true, - "organisationType":"board" - } - } - register: custodian_org_output - - debug: - var: custodian_org_output - - set_fact: - sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" - - debug: - var: sunbird_custodian_org_id - -# # Else login won't work - - name: Creating NTP org for login - block: - - uri: - url: "https://{{ domain_name }}/api/org/v1/create" - method: POST - headers: - x-authenticated-user-token: "{{ keycloak_access_token }}" - Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" - body_format: json - body: |- - { - "request": { - "orgName":"NTP", - "description":"NTP Organisation for Sunbird", - "isRootOrg": true, - "channel": "ntp", - "organisationType": "board", - "isTenant": true - } - } +- name: Creating root org + block: + - uri: + url: "https://{{ domain_name }}/api/org/v1/create" + method: POST + headers: + x-authenticated-user-token: "{{ keycloak_access_token }}" + Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" + body_format: json + body: |- + { + "request": { + "orgName": "Sunbird", + "channel": "{{ sunbird_default_channel }}", + "description": "Default Channel", + "isTenant": true, + "organisationType":"board" + } + } + register: custodian_org_output + - debug: + var: custodian_org_output + - set_fact: + sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" + - debug: + var: sunbird_custodian_org_id +# Else login won't work +- name: Creating NTP org for login + block: + - uri: + url: "https://{{ domain_name }}/api/org/v1/create" + method: POST + headers: + x-authenticated-user-token: "{{ keycloak_access_token }}" + Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" + body_format: json + body: |- + { + "request": { + "orgName":"NTP", + "description":"NTP Organisation for Sunbird", + "isRootOrg": true, + "channel": "ntp", + "organisationType": "board", + "isTenant": true + } + } -#- import_tasks: knowledge_platform_tasks.yaml -#- import_tasks: user_org.yaml -#- import_tasks: forms.yaml +# - import_tasks: knowledge_platform_tasks.yaml +# - import_tasks: user_org.yaml +# - import_tasks: forms.yaml From 9d81a12f2acd1714e1b717bec2fefebd2315b388 Mon Sep 17 00:00:00 2001 From: Haritest Date: Thu, 22 Sep 2022 14:01:11 +0530 Subject: [PATCH 11/34] Update main.yml --- ansible/roles/post-install/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index 121e4d0653..4549c65c0d 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -65,6 +65,6 @@ } } -# - import_tasks: knowledge_platform_tasks.yaml -# - import_tasks: user_org.yaml -# - import_tasks: forms.yaml + - import_tasks: knowledge_platform_tasks.yaml + - import_tasks: user_org.yaml + - import_tasks: forms.yaml From fe0d7622dd82587ab27f6ee4f05faf1c893e04e2 Mon Sep 17 00:00:00 2001 From: Haritest Date: Thu, 22 Sep 2022 14:02:13 +0530 Subject: [PATCH 12/34] Update main.yml --- ansible/roles/post-install/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index 4549c65c0d..84513e9d84 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -65,6 +65,6 @@ } } - - import_tasks: knowledge_platform_tasks.yaml - - import_tasks: user_org.yaml - - import_tasks: forms.yaml +- import_tasks: knowledge_platform_tasks.yaml +- import_tasks: user_org.yaml +- import_tasks: forms.yaml From 0a588b277586efbc5f4cc830573a9e9588423f50 Mon Sep 17 00:00:00 2001 From: Haritest Date: Thu, 22 Sep 2022 14:04:35 +0530 Subject: [PATCH 13/34] Update main.yml --- ansible/roles/post-install/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index 84513e9d84..c69d6e2afc 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -65,6 +65,6 @@ } } -- import_tasks: knowledge_platform_tasks.yaml +#- import_tasks: knowledge_platform_tasks.yaml - import_tasks: user_org.yaml - import_tasks: forms.yaml From 7a00803a9d5201247bf1411bffa0600bc019420d Mon Sep 17 00:00:00 2001 From: Haritest Date: Tue, 4 Oct 2022 14:36:30 +0530 Subject: [PATCH 14/34] Update main.yml --- ansible/roles/post-install/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/post-install/defaults/main.yml b/ansible/roles/post-install/defaults/main.yml index 9c9e626402..8128387dd6 100644 --- a/ansible/roles/post-install/defaults/main.yml +++ b/ansible/roles/post-install/defaults/main.yml @@ -1635,9 +1635,9 @@ custodian_org_data: - { "id": "{{ sunbird_default_channel }}", "field": "{{ sunbird_default_channel }}", "value": "https://{{ domain_name }}/faq" } default_user_details: - - { "firstName": "creator", "lastName": "", "email": "creator@yopmail.com", "password":"Pass@123" } - - { "firstName": "reviewer", "lastName": "", "email": "reviewer@yopmail.com", "password":"Pass@123" } - - { "firstName": "publisher", "lastName": "", "email": "publisher@yopmail.com", "password":"Pass@123" } + - { "firstName": "creator", "lastName": "", "email": "creator1@yopmail.com", "password":"Pass@123" } + - { "firstName": "reviewer", "lastName": "", "email": "reviewer1@yopmail.com", "password":"Pass@123" } + - { "firstName": "publisher", "lastName": "", "email": "publisher1@yopmail.com", "password":"Pass@123" } # These variables will get overridden on run time state_id: "" From ebf7381e6b3fd7f8eadd0354c675292a6289d879 Mon Sep 17 00:00:00 2001 From: Haritest Date: Tue, 4 Oct 2022 15:07:18 +0530 Subject: [PATCH 15/34] Update main.yml --- ansible/roles/post-install/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/post-install/defaults/main.yml b/ansible/roles/post-install/defaults/main.yml index 8128387dd6..15ec23b8ad 100644 --- a/ansible/roles/post-install/defaults/main.yml +++ b/ansible/roles/post-install/defaults/main.yml @@ -1635,9 +1635,9 @@ custodian_org_data: - { "id": "{{ sunbird_default_channel }}", "field": "{{ sunbird_default_channel }}", "value": "https://{{ domain_name }}/faq" } default_user_details: - - { "firstName": "creator", "lastName": "", "email": "creator1@yopmail.com", "password":"Pass@123" } - - { "firstName": "reviewer", "lastName": "", "email": "reviewer1@yopmail.com", "password":"Pass@123" } - - { "firstName": "publisher", "lastName": "", "email": "publisher1@yopmail.com", "password":"Pass@123" } + - { "firstName": "creator2", "lastName": "", "email": "creator2@yopmail.com", "password":"Pass@123" } + - { "firstName": "reviewer2", "lastName": "", "email": "reviewer2@yopmail.com", "password":"Pass@123" } + - { "firstName": "publisher2", "lastName": "", "email": "publisher2@yopmail.com", "password":"Pass@123" } # These variables will get overridden on run time state_id: "" From b10589cd40aa8be387d3e6332a8f573d7e36d7aa Mon Sep 17 00:00:00 2001 From: Haritest Date: Tue, 4 Oct 2022 15:39:43 +0530 Subject: [PATCH 16/34] Update user_org.yaml --- .../roles/post-install/tasks/user_org.yaml | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/ansible/roles/post-install/tasks/user_org.yaml b/ansible/roles/post-install/tasks/user_org.yaml index caee5ebaa7..413b996502 100644 --- a/ansible/roles/post-install/tasks/user_org.yaml +++ b/ansible/roles/post-install/tasks/user_org.yaml @@ -57,11 +57,6 @@ "operation":"add", "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] }, - { - "role": "REPORT_ADMIN", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, { "role": "CONTENT_REVIEWER", "operation":"add", @@ -82,11 +77,6 @@ "operation":"add", "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] }, - { - "role": "ORG_MANAGEMENT", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, { "role": "TEACHER_BADGE_ISSUER", "operation":"add", @@ -97,26 +87,11 @@ "operation":"add", "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] }, - { - "role": "CONTENT_CURATION", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, - { - "role": "SYSTEM_ADMINISTRATION", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, { "role": "ANNOUNCEMENT_SENDER", "operation":"add", "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] }, - { - "role": "PROGRAM_MANAGER", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, { "role": "REPORT_VIEWER", "operation":"add", @@ -127,21 +102,6 @@ "operation":"add", "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] }, - { - "role": "CONTENT_REVIEW", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, - { - "role": "CONTENT_CREATION", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, - { - "role": "MEMBERSHIP_MANAGEMENT", - "operation":"add", - "scope": [{ "organisationId": "{{ sunbird_custodian_org_id }}" }] - }, { "role": "COURSE_CREATOR", "operation":"add", From 5e990a9337495b56bb54aac3b54d28a68b640371 Mon Sep 17 00:00:00 2001 From: Haritest Date: Tue, 4 Oct 2022 15:42:33 +0530 Subject: [PATCH 17/34] Update main.yml --- ansible/roles/post-install/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/post-install/defaults/main.yml b/ansible/roles/post-install/defaults/main.yml index 15ec23b8ad..94cb6c9988 100644 --- a/ansible/roles/post-install/defaults/main.yml +++ b/ansible/roles/post-install/defaults/main.yml @@ -1635,9 +1635,9 @@ custodian_org_data: - { "id": "{{ sunbird_default_channel }}", "field": "{{ sunbird_default_channel }}", "value": "https://{{ domain_name }}/faq" } default_user_details: - - { "firstName": "creator2", "lastName": "", "email": "creator2@yopmail.com", "password":"Pass@123" } - - { "firstName": "reviewer2", "lastName": "", "email": "reviewer2@yopmail.com", "password":"Pass@123" } - - { "firstName": "publisher2", "lastName": "", "email": "publisher2@yopmail.com", "password":"Pass@123" } + - { "firstName": "creator3", "lastName": "", "email": "creator3@yopmail.com", "password":"Pass@123" } + - { "firstName": "reviewer3", "lastName": "", "email": "reviewer3@yopmail.com", "password":"Pass@123" } + - { "firstName": "publisher3", "lastName": "", "email": "publisher3@yopmail.com", "password":"Pass@123" } # These variables will get overridden on run time state_id: "" From bd67cebc2b9862fa96f0e6707c8d06380f4a9187 Mon Sep 17 00:00:00 2001 From: Haritest Date: Thu, 6 Oct 2022 11:49:32 +0530 Subject: [PATCH 18/34] Update main.yml --- ansible/roles/post-install/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index c69d6e2afc..84513e9d84 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -65,6 +65,6 @@ } } -#- import_tasks: knowledge_platform_tasks.yaml +- import_tasks: knowledge_platform_tasks.yaml - import_tasks: user_org.yaml - import_tasks: forms.yaml From 017653540a644327c9ca329fd4e78ef8cfca06cc Mon Sep 17 00:00:00 2001 From: Haritest Date: Thu, 6 Oct 2022 11:50:30 +0530 Subject: [PATCH 19/34] Update main.yml --- ansible/roles/post-install/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/post-install/defaults/main.yml b/ansible/roles/post-install/defaults/main.yml index 94cb6c9988..adef571366 100644 --- a/ansible/roles/post-install/defaults/main.yml +++ b/ansible/roles/post-install/defaults/main.yml @@ -1635,9 +1635,9 @@ custodian_org_data: - { "id": "{{ sunbird_default_channel }}", "field": "{{ sunbird_default_channel }}", "value": "https://{{ domain_name }}/faq" } default_user_details: - - { "firstName": "creator3", "lastName": "", "email": "creator3@yopmail.com", "password":"Pass@123" } - - { "firstName": "reviewer3", "lastName": "", "email": "reviewer3@yopmail.com", "password":"Pass@123" } - - { "firstName": "publisher3", "lastName": "", "email": "publisher3@yopmail.com", "password":"Pass@123" } + - { "firstName": "creator4", "lastName": "", "email": "creator4@yopmail.com", "password":"Pass@123" } + - { "firstName": "reviewer4", "lastName": "", "email": "reviewer4@yopmail.com", "password":"Pass@123" } + - { "firstName": "publisher4", "lastName": "", "email": "publisher4@yopmail.com", "password":"Pass@123" } # These variables will get overridden on run time state_id: "" From ceabf9d914a670114848df7db5afd702ed4cbf7a Mon Sep 17 00:00:00 2001 From: Haritest Date: Sun, 16 Oct 2022 12:30:24 +0530 Subject: [PATCH 20/34] Update main.yml --- kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml index b8aaa5bd92..734c491958 100644 --- a/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml +++ b/kubernetes/ansible/roles/sunbird-monitoring/defaults/main.yml @@ -7,7 +7,7 @@ monitoring_stack: - elasticsearch-exporter - logger - blackbox-exporter - - additional-scrape-configs + # - additional-scrape-configs - alertrules - kafka-topic-exporter - prometheus-redis-exporter From 543a761e4f653601b91f2af35829691b148a8651 Mon Sep 17 00:00:00 2001 From: Haritest Date: Thu, 27 Oct 2022 11:42:33 +0530 Subject: [PATCH 21/34] Update main.yml --- ansible/roles/post-install/tasks/main.yml | 98 +++++++++++------------ 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/ansible/roles/post-install/tasks/main.yml b/ansible/roles/post-install/tasks/main.yml index 84513e9d84..949252c68b 100644 --- a/ansible/roles/post-install/tasks/main.yml +++ b/ansible/roles/post-install/tasks/main.yml @@ -16,55 +16,55 @@ - debug: var: keycloak_access_token -- name: Creating root org - block: - - uri: - url: "https://{{ domain_name }}/api/org/v1/create" - method: POST - headers: - x-authenticated-user-token: "{{ keycloak_access_token }}" - Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" - body_format: json - body: |- - { - "request": { - "orgName": "Sunbird", - "channel": "{{ sunbird_default_channel }}", - "description": "Default Channel", - "isTenant": true, - "organisationType":"board" - } - } - register: custodian_org_output - - debug: - var: custodian_org_output - - set_fact: - sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" - - debug: - var: sunbird_custodian_org_id +#- name: Creating root org +# block: +# - uri: +# url: "https://{{ domain_name }}/api/org/v1/create" +# method: POST +# headers: +# x-authenticated-user-token: "{{ keycloak_access_token }}" +# Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" +# body_format: json +# body: |- +# { +# "request": { +# "orgName": "Sunbird", +# "channel": "{{ sunbird_default_channel }}", +# "description": "Default Channel", +# "isTenant": true, +# "organisationType":"board" +# } +# } +# register: custodian_org_output +# - debug: +# var: custodian_org_output +# - set_fact: +# sunbird_custodian_org_id: "{{ custodian_org_output.json.result.organisationId }}" +# - debug: +# var: sunbird_custodian_org_id # Else login won't work -- name: Creating NTP org for login - block: - - uri: - url: "https://{{ domain_name }}/api/org/v1/create" - method: POST - headers: - x-authenticated-user-token: "{{ keycloak_access_token }}" - Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" - body_format: json - body: |- - { - "request": { - "orgName":"NTP", - "description":"NTP Organisation for Sunbird", - "isRootOrg": true, - "channel": "ntp", - "organisationType": "board", - "isTenant": true - } - } +#- name: Creating NTP org for login +# block: +# - uri: +# url: "https://{{ domain_name }}/api/org/v1/create" +# method: POST +# headers: +# x-authenticated-user-token: "{{ keycloak_access_token }}" +# Authorization: "Bearer {{ core_vault_sunbird_api_auth_token }}" +# body_format: json +# body: |- + # { + # "request": { + # "orgName":"NTP", + # "description":"NTP Organisation for Sunbird", + # "isRootOrg": true, + # "channel": "ntp", + # "organisationType": "board", + # "isTenant": true + # } + # } -- import_tasks: knowledge_platform_tasks.yaml -- import_tasks: user_org.yaml -- import_tasks: forms.yaml +#- import_tasks: knowledge_platform_tasks.yaml +#- import_tasks: user_org.yaml +#- import_tasks: forms.yaml From fc94be9318881f16bdf44a15b759c6af347ae74a Mon Sep 17 00:00:00 2001 From: gohilamariappan <41056032+gohilamariappan@users.noreply.github.com> Date: Thu, 24 Nov 2022 11:34:08 +0530 Subject: [PATCH 22/34] updated search template --- .../stack-sunbird/templates/search-service_application.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/stack-sunbird/templates/search-service_application.conf b/ansible/roles/stack-sunbird/templates/search-service_application.conf index f976dc8706..da387a9835 100644 --- a/ansible/roles/stack-sunbird/templates/search-service_application.conf +++ b/ansible/roles/stack-sunbird/templates/search-service_application.conf @@ -332,7 +332,7 @@ installation.id="{{sunbird_installation}}" # ElasticSearch Configuration ekstepPlatformApiUserId="search-service" search.es_conn_info="{{ search_index_host }}" -search.fields.query=["name^100","title^100","lemma^100","code^100","domain","subject","description^10","keywords^100","ageGroup^10","filter^10","theme^10","genre^10","objects^25","contentType^100","language^200","teachingMode^25","skills^10","learningObjective^10","curriculum^100","gradeLevel^100","developer^100","attributions^10","identifier^100","IL_UNIQUE_ID^100","owner^50","board^100","relatedBoards^100","creator^100", "dialcodes^100","text","words","releaseNotes"] +search.fields.query=["name^100.0","keywords^60.0","purpose^60", "source^50.0","description^5.0","language^5.0"] search.fields.date=["lastUpdatedOn","createdOn","versionDate","lastSubmittedOn","lastPublishedOn"] search.fields.mode_collection=["identifier","name","objectType","contentType","mimeType","size","childNodes","board","subject","medium","gradeLevel","appIcon","resourceType","origin","originData"] search.batch.size=500 From 0670c91c3d1f50be0dea7eca2701dc5d93128392 Mon Sep 17 00:00:00 2001 From: Haritest Date: Fri, 25 Nov 2022 18:41:59 +0530 Subject: [PATCH 23/34] search fuzzy.when.noresult added --- .../stack-sunbird/templates/search-service_application.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible/roles/stack-sunbird/templates/search-service_application.conf b/ansible/roles/stack-sunbird/templates/search-service_application.conf index da387a9835..411f9c4fb1 100644 --- a/ansible/roles/stack-sunbird/templates/search-service_application.conf +++ b/ansible/roles/stack-sunbird/templates/search-service_application.conf @@ -347,3 +347,6 @@ compositesearch.index.name="{{ compositesearch_index_name }}" content.tagging.backward_enable=false content.tagging.property=["subject","medium"] search.payload.log_enable=true + +search.fields.enable.fuzzy.when.noresult=true + From 7610bc242f500ef4662c7e125ddf2b9175894899 Mon Sep 17 00:00:00 2001 From: "Radhesh.B.H" <44744695+Radheshhathwar@users.noreply.github.com> Date: Thu, 8 Dec 2022 16:31:49 +0530 Subject: [PATCH 24/34] Updated query value --- .../stack-sunbird/templates/search-service_application.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/stack-sunbird/templates/search-service_application.conf b/ansible/roles/stack-sunbird/templates/search-service_application.conf index 411f9c4fb1..5f9f3039e2 100644 --- a/ansible/roles/stack-sunbird/templates/search-service_application.conf +++ b/ansible/roles/stack-sunbird/templates/search-service_application.conf @@ -332,7 +332,7 @@ installation.id="{{sunbird_installation}}" # ElasticSearch Configuration ekstepPlatformApiUserId="search-service" search.es_conn_info="{{ search_index_host }}" -search.fields.query=["name^100.0","keywords^60.0","purpose^60", "source^50.0","description^5.0","language^5.0"] +search.fields.query=["name^100","title^100","lemma^100","code^100","domain","subject","description^10","keywords^100","ageGroup^10","filter^10","theme^10","genre^10","objects^25","contentType^100","language^200","teachingMode^25","skills^10","learningObjective^10","curriculum^100","gradeLevel^100","developer^100","attributions^10","identifier^100","IL_UNIQUE_ID^100","owner^50","board^100","relatedBoards^100","creator^100", "dialcodes^100","text","words","releaseNotes"] search.fields.date=["lastUpdatedOn","createdOn","versionDate","lastSubmittedOn","lastPublishedOn"] search.fields.mode_collection=["identifier","name","objectType","contentType","mimeType","size","childNodes","board","subject","medium","gradeLevel","appIcon","resourceType","origin","originData"] search.batch.size=500 From 9fec791cad093f26507d01c13db5c25e60b2e138 Mon Sep 17 00:00:00 2001 From: "Radhesh.B.H" <44744695+Radheshhathwar@users.noreply.github.com> Date: Thu, 15 Dec 2022 12:37:37 +0530 Subject: [PATCH 25/34] Removed additional query atributes Refined it as per requirement --- .../stack-sunbird/templates/search-service_application.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/stack-sunbird/templates/search-service_application.conf b/ansible/roles/stack-sunbird/templates/search-service_application.conf index 5f9f3039e2..fa2a690442 100644 --- a/ansible/roles/stack-sunbird/templates/search-service_application.conf +++ b/ansible/roles/stack-sunbird/templates/search-service_application.conf @@ -332,7 +332,7 @@ installation.id="{{sunbird_installation}}" # ElasticSearch Configuration ekstepPlatformApiUserId="search-service" search.es_conn_info="{{ search_index_host }}" -search.fields.query=["name^100","title^100","lemma^100","code^100","domain","subject","description^10","keywords^100","ageGroup^10","filter^10","theme^10","genre^10","objects^25","contentType^100","language^200","teachingMode^25","skills^10","learningObjective^10","curriculum^100","gradeLevel^100","developer^100","attributions^10","identifier^100","IL_UNIQUE_ID^100","owner^50","board^100","relatedBoards^100","creator^100", "dialcodes^100","text","words","releaseNotes"] +search.fields.query=["name^100","title^100","lemma^100","code^100","subject","description^10","keywords^100","filter^10","genre^10","objects^25","contentType^100","language^200","skills^10","curriculum^100","developer^100","attributions^10","identifier^100","owner^50","board^100","relatedBoards^100","creator^100","text","words"] search.fields.date=["lastUpdatedOn","createdOn","versionDate","lastSubmittedOn","lastPublishedOn"] search.fields.mode_collection=["identifier","name","objectType","contentType","mimeType","size","childNodes","board","subject","medium","gradeLevel","appIcon","resourceType","origin","originData"] search.batch.size=500 From 1ac1abfe5af7861e0e4649c2792ff687e4d33c19 Mon Sep 17 00:00:00 2001 From: "Radhesh.B.H" <44744695+Radheshhathwar@users.noreply.github.com> Date: Fri, 23 Dec 2022 09:23:49 +0530 Subject: [PATCH 26/34] Changed query value according to Production data Changed query value according to Production data --- .../stack-sunbird/templates/search-service_application.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/stack-sunbird/templates/search-service_application.conf b/ansible/roles/stack-sunbird/templates/search-service_application.conf index fa2a690442..fda00cf221 100644 --- a/ansible/roles/stack-sunbird/templates/search-service_application.conf +++ b/ansible/roles/stack-sunbird/templates/search-service_application.conf @@ -332,7 +332,7 @@ installation.id="{{sunbird_installation}}" # ElasticSearch Configuration ekstepPlatformApiUserId="search-service" search.es_conn_info="{{ search_index_host }}" -search.fields.query=["name^100","title^100","lemma^100","code^100","subject","description^10","keywords^100","filter^10","genre^10","objects^25","contentType^100","language^200","skills^10","curriculum^100","developer^100","attributions^10","identifier^100","owner^50","board^100","relatedBoards^100","creator^100","text","words"] +search.fields.query=["name^100", "identifier^100", "purpose^60", "keywords^60", "source^50.0", "owner^50", "creator^20", "language^20.0", "contentType^10", "description^5.0"] search.fields.date=["lastUpdatedOn","createdOn","versionDate","lastSubmittedOn","lastPublishedOn"] search.fields.mode_collection=["identifier","name","objectType","contentType","mimeType","size","childNodes","board","subject","medium","gradeLevel","appIcon","resourceType","origin","originData"] search.batch.size=500 From 349e992b8ee6a2c0cf38d278eea4b3990b0976dd Mon Sep 17 00:00:00 2001 From: gohilamariappan <41056032+gohilamariappan@users.noreply.github.com> Date: Tue, 17 Jan 2023 16:17:45 +0530 Subject: [PATCH 27/34] added sunbird_mail_server_use_tls --- .../stack-sunbird/templates/sunbird_notification-service.env | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env b/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env index 6189bdafa5..02a7bc02a7 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env @@ -35,3 +35,6 @@ LEARNER_SERVICE_PORT=http://learner-service:9000 sunbird_us_system_setting_url=/api/data/v1/system/settings/list sunbird_us_org_read_url=/v1/org/read notification_category_type_config=certificateUpdate +sunbird_mail_server_use_tls="true" + + From f505089623c395f61abb5d0d5724bb0f891524e4 Mon Sep 17 00:00:00 2001 From: Haritest Date: Wed, 31 May 2023 13:06:05 +0530 Subject: [PATCH 28/34] Update search-service_application.conf search.fields.enable.secureSettings --- .../stack-sunbird/templates/search-service_application.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/stack-sunbird/templates/search-service_application.conf b/ansible/roles/stack-sunbird/templates/search-service_application.conf index fda00cf221..5f35f88ca9 100644 --- a/ansible/roles/stack-sunbird/templates/search-service_application.conf +++ b/ansible/roles/stack-sunbird/templates/search-service_application.conf @@ -349,4 +349,4 @@ content.tagging.property=["subject","medium"] search.payload.log_enable=true search.fields.enable.fuzzy.when.noresult=true - +search.fields.enable.secureSettings=true From 198ff767c439666a2d8ec2758b953a572e035fd9 Mon Sep 17 00:00:00 2001 From: Haritest Date: Tue, 6 Jun 2023 16:09:21 +0530 Subject: [PATCH 29/34] Update Jenkinsfile docker push --- pipelines/upload/docker/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pipelines/upload/docker/Jenkinsfile b/pipelines/upload/docker/Jenkinsfile index d401a86560..aeeb8900c4 100644 --- a/pipelines/upload/docker/Jenkinsfile +++ b/pipelines/upload/docker/Jenkinsfile @@ -37,7 +37,7 @@ node(){ throw err } finally { - slack_notify(currentBuild.result) - email_notify() + // slack_notify(currentBuild.result) + // email_notify() } } From 06991f716a010180856b750106f6df2fdbf17089 Mon Sep 17 00:00:00 2001 From: Haritest Date: Tue, 26 Sep 2023 11:22:02 +0530 Subject: [PATCH 30/34] Update main.yml cassandra repo updated --- ansible/roles/cassandra/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/cassandra/defaults/main.yml b/ansible/roles/cassandra/defaults/main.yml index 33c02c17bf..8f1f0f7951 100644 --- a/ansible/roles/cassandra/defaults/main.yml +++ b/ansible/roles/cassandra/defaults/main.yml @@ -1,5 +1,5 @@ user_home: "/home/{{ ansible_ssh_user }}/" -cassandra_repo: 'deb http://www.apache.org/dist/cassandra/debian 311x main' -cassandra_repo_key: 'https://www.apache.org/dist/cassandra/KEYS' +cassandra_repo: 'deb https://debian.cassandra.apache.org 311x main' +cassandra_repo_key: 'https://downloads.apache.org/cassandra/KEYS' resource_crunch: "yes" # make this value yes if heap size should be quarter of the Server Memory when you are deploying multiple databases, else make this value no to have 50% of the value as per the best practice of cassandra cassandra_home_directory: "/var/lib/cassandra" From cd30abee20f2476c3a886dce7917b10d2622608c Mon Sep 17 00:00:00 2001 From: Haritest Date: Tue, 26 Sep 2023 21:47:28 +0530 Subject: [PATCH 31/34] Update Jenkinsfile 'build-slave' added in node --- pipelines/upload/docker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/upload/docker/Jenkinsfile b/pipelines/upload/docker/Jenkinsfile index aeeb8900c4..41d4bc0b40 100644 --- a/pipelines/upload/docker/Jenkinsfile +++ b/pipelines/upload/docker/Jenkinsfile @@ -1,5 +1,5 @@ @Library('deploy-conf') _ -node(){ +node('build-slave'){ try { stage('checkout public repo') { folder = new File("$WORKSPACE/.git") From 63444c8ca62fb3f88155b94778f039bdcdabdd51 Mon Sep 17 00:00:00 2001 From: Haritest Date: Fri, 6 Oct 2023 16:09:19 +0530 Subject: [PATCH 32/34] Update sunbird_telemetry-service.env telemetry_kafka_compression changed to NONE --- .../roles/stack-sunbird/templates/sunbird_telemetry-service.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/stack-sunbird/templates/sunbird_telemetry-service.env b/ansible/roles/stack-sunbird/templates/sunbird_telemetry-service.env index 1fe41c7039..4aa895c3b7 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_telemetry-service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_telemetry-service.env @@ -4,7 +4,7 @@ telemetry_local_storage_enabled=true telemetry_local_storage_type={{sunbird_telemetry_dispatchers}} telemetry_kafka_broker_list={{sunbird_telemetry_kafka_servers}} telemetry_kafka_topic={{sunbird_telemetry_kafka_topic}} -telemetry_kafka_compression=snappy +telemetry_kafka_compression=NONOE # Below is the config to enable Telemetry Proxy. To send telemetry data to ekstep telemetry_proxy_enabled=false From 2f10e1a4e68bab5713ed9fc9083205adc77dc188 Mon Sep 17 00:00:00 2001 From: Haritest Date: Fri, 6 Oct 2023 16:12:40 +0530 Subject: [PATCH 33/34] Update sunbird_telemetry-service.env typo updated --- .../roles/stack-sunbird/templates/sunbird_telemetry-service.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/stack-sunbird/templates/sunbird_telemetry-service.env b/ansible/roles/stack-sunbird/templates/sunbird_telemetry-service.env index 4aa895c3b7..6d7dc93783 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_telemetry-service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_telemetry-service.env @@ -4,7 +4,7 @@ telemetry_local_storage_enabled=true telemetry_local_storage_type={{sunbird_telemetry_dispatchers}} telemetry_kafka_broker_list={{sunbird_telemetry_kafka_servers}} telemetry_kafka_topic={{sunbird_telemetry_kafka_topic}} -telemetry_kafka_compression=NONOE +telemetry_kafka_compression=none # Below is the config to enable Telemetry Proxy. To send telemetry data to ekstep telemetry_proxy_enabled=false From b35fef505e645c21ae47767a3c4f874aa6601ebf Mon Sep 17 00:00:00 2001 From: Haritest Date: Wed, 17 Jul 2024 19:47:09 +0530 Subject: [PATCH 34/34] Update Jenkinsfile artifact upload fix --- pipelines/upload/artifacts/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pipelines/upload/artifacts/Jenkinsfile b/pipelines/upload/artifacts/Jenkinsfile index 5eb2559be7..88e88308ff 100644 --- a/pipelines/upload/artifacts/Jenkinsfile +++ b/pipelines/upload/artifacts/Jenkinsfile @@ -34,7 +34,7 @@ node() { throw err } finally { - slack_notify(currentBuild.result) - email_notify() + // slack_notify(currentBuild.result) + // email_notify() } }