Release 3.4.0 variables update (#2085)

* updated analytics and search service url * Update all.yml * Update common.yml * Update secrets.yml * Update hosts * Update common.yml * Update secrets.yml * Update common.yml * Update hosts * Update common.yml * Update secrets.yml * Update hosts * Update common.yml * Update jenkins-server-setup.sh * added jenkins jobs * Update jenkins-plugins-setup.sh Co-authored-by: G33tha <[email protected]>
project-sunbird · Dec 17, 2020 · 2c0b6b3 · 2c0b6b3
1 parent 8582714
commit 2c0b6b3
Show file tree

Hide file tree

Showing 421 changed files with 22,991 additions and 4,010 deletions.
diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
@@ -110,8 +110,8 @@ sunbird_cassandra_host: "{{groups['cassandra']|join(',')}}"  #Private IP of Cass
 sunbird_es_host: "{{groups['es']| join(',')}}"
 
 ## Application server configurations
-sunbird_analytics_api_base_url: "http://{{analyticsapi_ip}}:9000"
-sunbird_search_service_api_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:9004"
+sunbird_analytics_api_base_url: "analytics-service.{{namespace}}.svc.cluster.local:9000"
+sunbird_search_service_api_base_url: "http://{{private_ingressgateway_ip}}/search"
 sunbird_mail_server_host: "{{ mail_server_host }}"  #SMTP server IP. Could be ignored if not mails are to be sent.
 sunbird_mail_server_port: "{{ mail_server_port }}" #SMTP port. Could be ignored if not mails are to be sent.
 sunbird_mail_server_username: "{{ mail_server_username }}"  #SMTP username. Could be ignored if not mails are to be sent.
@@ -197,8 +197,8 @@ sunbird_dial_repo_api_key: "{{ core_vault_sunbird_ekstep_api_key }}"
 sunbird_plugin_repo_api_base_url: "{{ sunbird_search_service_api_base_url }}"
 sunbird_data_service_api_base_url: "{{sunbird_ekstep_api_base_url}}"
 sunbird_data_service_api_key: "{{ core_vault_sunbird_ekstep_api_key }}"
-sunbird_content_service_api_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:9002"
-sunbird_user_service_api_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:9000"
+sunbird_content_service_api_base_url: "http://{{private_ingressgateway_ip}}/content"
+sunbird_user_service_api_base_url: "http://{{private_ingressgateway_ip}}/learner"
 sunbird_group_service_api_base_url: "http://groups-service:9000"
 
 #API Manager
@@ -262,7 +262,7 @@ enable_scraping_docker_metrics: false
 postgres_exporter_postgres_port: 5432
 postgres_exporter_user: postgres_exporter
 sunbird_cs_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:5000"
-sunbird_user_service_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:9000"
+sunbird_user_service_base_url: "http://{{private_ingressgateway_ip}}/learner"
 kong_admin_api_url: http://localhost:8001
 
 
@@ -342,7 +342,7 @@ sunbird_device_register_api: "{{proto}}://{{api_proxy_name}}/v3/device/register/
 sunbird_course_batch_notification_signature: sunbird
 
 sunbird_authorization: "{{core_vault_sunbird_api_auth_token}}"
-sunbird_lms_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:8000"
+sunbird_lms_base_url: "http://{{private_ingressgateway_ip}}/api"
 sunbird_content_service_local_base_url: "http://{{sunbird_swarm_manager_lb_ip}}:5000"
 sunbird_kafka_host: "{{sunbird_processing_kafka_host}}"
 sunbird_qrimage_topic: "{{env}}.qrimage.request"
@@ -543,7 +543,7 @@ sunbird_sso_kafka_topic: "{{env_name}}.lms.sso.events"
 __yarn_host__: "{{ groups['yarn-master'][0] }}"
 zookeepers: "{{groups['zookeeper']|join(':2181,')}}:2181"
 kafka_brokers: "{{groups['processing-cluster-kafka']|join(':9092,')}}:9092"
-__lms_host__: "http://{{sunbird_swarm_manager_lb_ip}}:9000"
+__lms_host__: "http://{{private_ingressgateway_ip}}/learner"
 sunbird_redis_host: "{{ groups['lp-redis'][0] }}"
 
 
@@ -649,3 +649,11 @@ group_activity_agg_cache_enable: false
 
 # nodebb variables
 sunbird_nodebb_storage_key: "{{ core_vault_sunbird_nodebb_storage_key }}"
+kibana_service: kibana.logging.svc.cluster.local:5601
+sunbird_dial_repo_api_base_url: "http://{{dialservice_ip}}:9001"
+
+#report service
+dp_postgres_host: "{{ groups['postgres'][0] }}"
+dp_postgres_db: analytics
+dp_postgres_password: "{{ core_vault_dp_pgdb_password }}"
+dp_postgres_username: analytics
diff --git a/deploy/jenkins/jenkins-plugins-setup.sh b/deploy/jenkins/jenkins-plugins-setup.sh
@@ -4,21 +4,21 @@ normal=$(tput sgr0)
 
 if [[ ! -d /var/lib/jenkins/.m2 ]]; then
 echo -e "\n\e[0;32m${bold}Downloading and copying m2 directory to Jenkins ${normal}"
-wget https://sunbirdpublic.blob.core.windows.net/installation/m2_updated.zip
-unzip m2_updated.zip
+wget https://sunbirdpublic.blob.core.windows.net/installation/m2_new.zip
+unzip m2_new.zip
 mv .m2 /var/lib/jenkins
 chown -R jenkins:jenkins /var/lib/jenkins/.m2
 fi
 
 echo -e "\n\e[0;32m${bold}Downloading and copying jenkins plugin directory to Jenkins ${normal}"
 if [[ ! -d /var/lib/jenkins/plugins ]]; then
-wget https://sunbirdpublic.blob.core.windows.net/installation/JenkinsPlugin.zip
-unzip JenkinsPlugin.zip
+wget https://sunbirdpublic.blob.core.windows.net/installation/jenkins-plugins-new.zip
+unzip jenkins-plugins-new.zip
 mv plugins /var/lib/jenkins/
 chown -R jenkins:jenkins /var/lib/jenkins/plugins
 else
-wget https://sunbirdpublic.blob.core.windows.net/installation/JenkinsPlugin.zip
-unzip JenkinsPlugin.zip
+wget https://sunbirdpublic.blob.core.windows.net/installation/jenkins-plugins-new.zip
+unzip jenkins-plugins-new.zip
 cp -rf plugins/* /var/lib/jenkins/plugins/
 chown -R jenkins:jenkins /var/lib/jenkins/plugins
 fi

diff --git a/deploy/jenkins/jenkins-server-setup.sh b/deploy/jenkins/jenkins-server-setup.sh
@@ -15,7 +15,7 @@ echo -e "\n\e[0;32m${bold}Installating Jenkins${normal}"
 wget -q -O - https://pkg.jenkins.io/debian-stable/jenkins.io.key | apt-key add -
 apt-add-repository "deb https://pkg.jenkins.io/debian-stable binary/"
 apt-get update
-apt-get install -y jenkins=2.190.2
+apt-get install -y jenkins=2.263.1
 
 echo -e "\n\e[0;32m${bold}Installating PIP${normal}"
 apt-get install -y python-pip
@@ -128,6 +128,22 @@ echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee -a /etc/a
 apt-get update
 apt-get install -y kubectl
 
+#Install yarn 
+curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+apt update && apt install yarn
+
+wget https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_linux-x64_bin.tar.gz
+tar -xf openjdk-11+28_linux-x64_bin.tar.gz
+mv jdk-11 java-11-openjdk-amd64
+cp -r java-11-openjdk-amd64 /usr/lib/jvm/
+rm -rf java-11-openjdk-amd64 openjdk-11+28_linux-x64_bin.tar.gz
+
+wget https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
+tar -xf apache-maven-3.6.3-bin.tar.gz
+mv apache-maven-3.6.3/bin/mvn /opt/apache-maven-3.6.3/bin/mvn.3.6
+rm -rf apache-maven-3.6.3-bin.tar.gz
+
 echo -e "\n\e[0;32m${bold}Clean up${normal}"
 sudo apt -y autoremove
 

diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml
@@ -1,12 +1,12 @@
 <?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
   <actions/>
   <description></description>
   <properties>
-    <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.5.0-rc1">
+    <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
       <dockerLabel></dockerLabel>
-      <registry plugin="docker-commons@1.15"/>
-    </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+      <registry plugin="docker-commons@1.16"/>
+    </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
   </properties>
   <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
     <views>

diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManager/config.xml
@@ -1,26 +1,25 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="[email protected]">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="[email protected]">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -35,7 +34,7 @@
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,20 +50,21 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected].1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected].2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>Build/Core/APIManager</upstreamProjects>
+          <spec/>
+          <upstreamProjects>/Build/Core/APIManager</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManagerEcho/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManagerEcho/config.xml
@@ -1,26 +1,25 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="[email protected]">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="[email protected]">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
       </jobPropertyDescriptors>
     </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
   </actions>
-  <description></description>
+  <description/>
   <keepDependencies>false</keepDependencies>
   <properties>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
         <daysToKeep>-1</daysToKeep>
-        <numToKeep>-1</numToKeep>
+        <numToKeep>10</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>5</artifactNumToKeep>
+        <artifactNumToKeep>1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -29,13 +28,13 @@
         <hudson.model.StringParameterDefinition>
           <name>absolute_job_path</name>
           <description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue>Build/Core/APIManagerEcho</defaultValue>
+          <defaultValue>Build/Core/ApiManagerEcho</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>image_tag</name>
           <description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
-          <defaultValue></defaultValue>
+          <defaultValue/>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
@@ -51,20 +50,21 @@ ArtifactRepo - Push the docker image to container registry.
         </hudson.model.ChoiceParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected].1">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected].2">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
       <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
-      <paramsToUseForLimit></paramsToUseForLimit>
+      <paramsToUseForLimit/>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+
     <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
       <triggers>
         <jenkins.triggers.ReverseBuildTrigger>
-          <spec></spec>
-          <upstreamProjects>Build/Core/APIManagerEcho</upstreamProjects>
+          <spec/>
+          <upstreamProjects>/Build/Core/ApiManagerEcho</upstreamProjects>
           <threshold>
             <name>SUCCESS</name>
             <ordinal>0</ordinal>
@@ -75,8 +75,8 @@ ArtifactRepo - Push the docker image to container registry.
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +94,7 @@ ArtifactRepo - Push the docker image to container registry.
         <hudson.plugins.git.extensions.impl.CloneOption>
           <shallow>true</shallow>
           <noTags>false</noTags>
-          <reference></reference>
+          <reference/>
           <depth>1</depth>
           <honorRefspec>false</honorRefspec>
         </hudson.plugins.git.extensions.impl.CloneOption>
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>