Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ED-2838: ##Release-6.0.0 new variables #3899

Merged
merged 4 commits into from
Sep 26, 2023
Merged

ED-2838: ##Release-6.0.0 new variables #3899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af7f508
ED-2838 Release-6.0.0 new variables
tsprasath Sep 20, 2023
4f1bf4b
Added with comments
tsprasath Sep 20, 2023
c79de53
ED-2838 jenkins josb update and new variables
tsprasath Sep 26, 2023
ec91f18
added storage endpoint detials
tsprasath Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,30 @@
<defaultValue>refs/heads/${public_repo_branch}</defaultValue>
<trim>true</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_GROUP_ID</name>
<description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
&lt;li&gt;Mention the cloud storage sdk group id&lt;/li&gt;
&lt;/b&gt;&lt;/font&gt;</description>
<defaultValue>org.sunbird</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_ARTIFACT_ID</name>
<description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
&lt;li&gt;Mention the cloud storage sdk artifact id&lt;/li&gt;
&lt;/b&gt;&lt;/font&gt;</description>
<defaultValue>cloud-store-sdk_2.12</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_VERSION</name>
<description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
&lt;li&gt;Mention the cloud storage sdk version&lt;/li&gt;
&lt;/b&gt;&lt;/font&gt;</description>
<defaultValue>1.4.0</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected]">
Expand All @@ -48,12 +72,7 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>

<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<hudson.triggers.SCMTrigger>
<spec>H/15 * * * *</spec>
<ignorePostCommitHooks>false</ignorePostCommitHooks>
</hudson.triggers.SCMTrigger>
</triggers>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="[email protected]">
Expand Down
18 changes: 18 additions & 0 deletions deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,24 @@
<defaultValue>refs/heads/${public_repo_branch}</defaultValue>
<trim>true</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_GROUP_ID</name>
<description>Set the Cloud store sdk group id. e.g. org.sunbird</description>
<defaultValue>${cloud_store_group_id}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_ARTIFACT_ID</name>
<description>Set the Cloud store sdk artifact id. e.g. cloud-store-sdk_2.12</description>
<defaultValue>${cloud_store_artifact_id}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_VERSION</name>
<description>Set the Cloud store sdk version. e.g. 1.4.6</description>
<defaultValue>${cloud_store_version}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected]">
Expand Down
20 changes: 19 additions & 1 deletion deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,24 @@
<defaultValue>refs/heads/${public_repo_branch}</defaultValue>
<trim>true</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>cloud_store_group_id</name>
<description>Set the Cloud store sdk group id. e.g. org.sunbird</description>
<defaultValue>${cloud_store_group_id}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>cloud_store_artifact_id</name>
<description>Set the Cloud store sdk artifact id. e.g. cloud-store-sdk</description>
<defaultValue>${cloud_store_artifact_id}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>cloud_store_version</name>
<description>Set the Cloud store sdk version. e.g. 1.4.6</description>
<defaultValue>${cloud_store_version}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected]">
Expand All @@ -51,7 +69,7 @@
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<hudson.triggers.SCMTrigger>
<spec>H/15 * * * *</spec>
<spec/>
<ignorePostCommitHooks>false</ignorePostCommitHooks>
</hudson.triggers.SCMTrigger>
</triggers>
Expand Down
18 changes: 18 additions & 0 deletions deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,24 @@
<defaultValue>refs/heads/${public_repo_branch}</defaultValue>
<trim>true</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>cloud_store_group_id</name>
<description>Set the Cloud store sdk group id. e.g. org.sunbird</description>
<defaultValue>${cloud_store_group_id}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>cloud_store_artifact_id</name>
<description>Set the Cloud store sdk artifact id. e.g. cloud-store-sdk</description>
<defaultValue>${cloud_store_artifact_id}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>cloud_store_version</name>
<description>Set the Cloud store sdk version. e.g 1.4.6</description>
<defaultValue>${cloud_store_version}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected]">
Expand Down
26 changes: 25 additions & 1 deletion deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,30 @@
<defaultValue>refs/heads/${public_repo_branch}</defaultValue>
<trim>true</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_GROUP_ID</name>
<description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
&lt;li&gt;Mention the cloud storage sdk group id&lt;/li&gt;
&lt;/b&gt;&lt;/font&gt;</description>
<defaultValue>org.sunbird</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_ARTIFACT_ID</name>
<description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
&lt;li&gt;Mention the cloud storage sdk artifact id&lt;/li&gt;
&lt;/b&gt;&lt;/font&gt;</description>
<defaultValue>cloud-store-sdk_2.12</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_VERSION</name>
<description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
&lt;li&gt;Mention the cloud storage sdk version&lt;/li&gt;
&lt;/b&gt;&lt;/font&gt;</description>
<defaultValue>1.4.0</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected]">
Expand All @@ -51,7 +75,7 @@
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<hudson.triggers.SCMTrigger>
<spec>H/15 * * * *</spec>
<spec/>
<ignorePostCommitHooks>false</ignorePostCommitHooks>
</hudson.triggers.SCMTrigger>
</triggers>
Expand Down
23 changes: 22 additions & 1 deletion deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,27 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
<description>&lt;font color=red size=2&gt;&lt;b&gt;CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.&lt;/b&gt;&lt;/font&gt;</description>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_GROUP_ID</name>
<description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
&lt;li&gt;Mention the cloud storage sdk group id&lt;/li&gt;
&lt;/b&gt;&lt;/font&gt;</description>
<defaultValue>org.sunbird</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_ARTIFACT_ID</name>
<description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
&lt;li&gt;Mention the cloud storage sdk artifact id&lt;/li&gt;
&lt;/b&gt;&lt;/font&gt;</description>
<defaultValue>cloud-store-sdk_2.12</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_VERSION</name>
<description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
Expand All @@ -51,7 +72,7 @@
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<hudson.triggers.SCMTrigger>
<spec>H/15 * * * *</spec>
<spec/>
<ignorePostCommitHooks>false</ignorePostCommitHooks>
</hudson.triggers.SCMTrigger>
</triggers>
Expand Down
18 changes: 18 additions & 0 deletions deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,24 @@
<defaultValue>refs/heads/${public_repo_branch}</defaultValue>
<trim>true</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_GROUP_ID</name>
<description>Set the Cloud store sdk group id. e.g. org.sunbird</description>
<defaultValue>${cloud_store_group_id}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_ARTIFACT_ID</name>
<description>Set the Cloud store sdk artifact id. e.g. cloud-store-sdk_2.12</description>
<defaultValue>${cloud_store_artifact_id}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>CLOUD_STORE_VERSION</name>
<description>Set the Cloud store sdk version. e.g. 1.4.6</description>
<defaultValue>${cloud_store_version}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected]">
Expand Down
25 changes: 19 additions & 6 deletions deploy/jenkins/jobs/Build/jobs/Lern/jobs/LernDataProducts/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,24 @@
<defaultValue>refs/heads/${public_repo_branch}</defaultValue>
<trim>true</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>cloud_store_group_id</name>
<description>Set the Cloud store sdk group id. e.g. org.sunbird</description>
<defaultValue>${cloud_store_group_id}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>cloud_store_artifact_id</name>
<description>Set the Cloud store sdk artifact id. e.g. cloud-store-sdk_2.12</description>
<defaultValue>${cloud_store_artifact_id}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>cloud_store_version</name>
<description>Set the Cloud store sdk version. e.g. 1.4.6</description>
<defaultValue>${cloud_store_version}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected]">
Expand All @@ -49,12 +67,7 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>

<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<hudson.triggers.SCMTrigger>
<spec>H/15 * * * *</spec>
<ignorePostCommitHooks>false</ignorePostCommitHooks>
</hudson.triggers.SCMTrigger>
</triggers>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="[email protected]">
Expand Down
18 changes: 18 additions & 0 deletions deploy/jenkins/jobs/Build/jobs/Lern/jobs/LernFlinkJobs/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,24 @@
<defaultValue>refs/heads/${public_repo_branch}</defaultValue>
<trim>true</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>cloud_store_group_id</name>
<description>Set the Cloud store sdk group id. e.g. org.sunbird</description>
<defaultValue>${cloud_store_group_id}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>cloud_store_artifact_id</name>
<description>Set the Cloud store sdk artifact id. e.g. cloud-store-sdk_2.12</description>
<defaultValue>${cloud_store_artifact_id}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>cloud_store_version</name>
<description>Set the Cloud store sdk version. e.g. 1.4.6</description>
<defaultValue>${cloud_store_version}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected]">
Expand Down
9 changes: 9 additions & 0 deletions private_repo/ansible/inventory/dev/Core/common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,3 +488,12 @@ ml_analytics_cname_url: # Reference value - https://obj.dev.sunbirded.org/samiks
ml_analytics_client_id : project-sunbird-dev-client # Keycloak client group
ml_analytics_username : reportAdmin1 # Username of a user which has roles of "PROGRAM_MANAGER", "PROGRAM_DESIGNER", "REPORT_ADMIN", "REPORT_VIEWER"
ml_analytics_createdBy : fb85a044-d9eb-479b-a55a-faf1bfaea14d # Unique system generated user UUID which is the same user as above
ml_container: samiksha

# provide the s3 compatible endpoint
# for AWS
# cloud_private_storage_account_endpoint: "https://s3.{{ cloud_public_storage_region }}.amazonaws.com"
# for OCI
#cloud_private_storage_account_endpoint: "https://<oci_namespace>.compat.objectstorage.{{cloud_public_storage_region}}.oraclecloud.com"
cloud_private_storage_account_endpoint: "{{ cloud_public_storage_endpoint }}" # Leave Blank for Azure
bb_name: "" #Leave Blank
2 changes: 1 addition & 1 deletion private_repo/ansible/inventory/dev/Core/secrets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,4 +237,4 @@ lp_vault_youtube_api_key: # youtube api token if you want
# Examples values added below
ml_analytics_authorization_access_token : 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJkOTY3NzRjYzXXXXXXXXXXXXXQ4Y2RiOWQ2Mzg0OSJ9.n4hXxKxl_698yeZPSWhXeGvMOb4esfgPadIZe8jZ0Z4' # Bearer auth token which has access to APIs as defined in the release note
ml_analytics_password : Test@123 # Password of a user which has roles of "PROGRAM_MANAGER", "PROGRAM_DESIGNER", "REPORT_ADMIN", "REPORT_VIEWER" matching with supplied username to variable ml_analytics_username
ml_analytics_client_secret : fd241dce-4ZZ9-47e1-97cf-1c7de7a44216 # Keycloak client secret for creating tokens, mapped to client id supplied to variable ml_analytics_client_id
ml_analytics_client_secret : fd241dce-4ZZ9-47e1-97cf-1c7de7a44216 # Keycloak client secret for creating tokens, mapped to client id supplied to variable ml_analytics_client_id
8 changes: 7 additions & 1 deletion private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,4 +213,10 @@ postgres:
db_admin_password: "{{dp_vault_pgdb_admin_password}}"

# graylog
send_logs_to_graylog: true # filebeat agents will send logs to graylog instead of ES
send_logs_to_graylog: true # filebeat agents will send logs to graylog instead of ES

druid_storage_type: "" # Your cloud service provider name. Supported values are aws, azure, gcloud

# Optional variables - Can be left blank
cloud_storage_report_verfication_bucketname: ""
dp_storage_endpoint_config: ""