diff --git a/deploy/jenkins/jenkins-server-setup.sh b/deploy/jenkins/jenkins-server-setup.sh
index 739fb138dc..2c7516a57a 100755
--- a/deploy/jenkins/jenkins-server-setup.sh
+++ b/deploy/jenkins/jenkins-server-setup.sh
@@ -156,7 +156,7 @@ rm openjdk-11.0.2_linux-x64_bin.tar.gz
#Install maven 3.6.3
echo -e "\n\e[0;32m${bold}Installating maven 3.6.3${normal}"
-wget https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
+wget https://archive.apache.org/dist/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 /opt/
mv /opt/apache-maven-3.6.3/bin/mvn /opt/apache-maven-3.6.3/bin/mvn3.6
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/InquiryFlinkJob/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/InquiryFlinkJob/config.xml
new file mode 100644
index 0000000000..28b220559d
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/InquiryFlinkJob/config.xml
@@ -0,0 +1,108 @@
+
+
+
+
+ hudson.model.ParametersDefinitionProperty
+ com.sonyericsson.rebuild.RebuildSettings
+
+
+
+
+ false
+
+
+
+ -1
+ 10
+ -1
+ 1
+
+
+
+
+ false
+ false
+
+
+
+
+ absolute_job_path
+ <font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font>
+ Build/KnowledgePlatform/InquiryFlinkJob
+ false
+
+
+ image_tag
+ <font color=darkgreen size=2><b>OPTIONAL: Specify the tag to upload a specific image version to the container registry.</b></font>
+
+ false
+
+
+ artifact_source
+ <font color=dimgray size=2><b>
+ArtifactRepo - Push the docker image to container registry.
+</b></font>
+
+
+ ArtifactRepo
+
+
+
+
+
+
+ 0
+ 0
+
+ false
+ project
+ false
+
+
+
+
+
+
+
+ Build/KnowledgePlatform/InquiryFlinkJob
+
+ SUCCESS
+ 0
+ BLUE
+ true
+
+
+
+
+
+
+
+ 2
+
+
+ https://github.com/Sunbird-inQuiry/data-pipeline.git
+
+
+
+
+ ${inquiry_pipeline_branch_or_tag}
+
+
+ false
+
+
+
+ true
+ false
+
+ 0
+ false
+
+
+
+ kubernetes/pipelines/upload/Jenkinsfile
+ false
+
+
+ false
+
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
index d2c038b5fa..b4deb5e46b 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
@@ -1,6 +1,6 @@
-
+
hudson.model.ParametersDefinitionProperty
com.sonyericsson.rebuild.RebuildSettings
@@ -19,26 +19,47 @@
-
+
false
false
- github_release_tag
+ inquiry_release_tag
<font style="color:dimgray;font-size:14px;"><b>
<li>To build from a tag, use refs/tags/github_tag</li>
<li>To build from a branch, use refs/heads/github_branch</li>
-<li>The default value of ${public_repo_branch} will be the release / tag version set in global configuration</li>
-<li>To build from a differnt branch, replace the ${public_repo_branch} with your branch</li>
+<li>The default value of ${inquiry_service_build_branch_or_tag} will be the release / tag version set in global configuration</li>
+<li>To build from a differnt branch, replace the ${inquiry_service_build_branch_or_tag} with your branch</li>
</b></font>
- refs/heads/${public_repo_branch}
+ refs/heads/${inquiry_service_build_branch_or_tag}
true
+
+ core_release_tag
+ <font style="color:dimgray;font-size:14px;"><b>
+<li>Provide this value to build core components from Knowlg BB</li>
+<li>To build from a tag, use refs/tags/github_tag</li>
+<li>To build from a branch, use refs/heads/github_branch</li>
+<li>The default value of ${inquiry_core_build_branch_or_tag} will be the release / tag version set in global configuration</li>
+<li>To build from a differnt branch, replace the ${inquiry_core_build_branch_or_tag} with your branch</li>
+</b></font>
+ refs/heads/${inquiry_core_build_branch_or_tag}
+ false
+
+
+ core_repo_link
+ Knowlg Core Repo
+
+
+ https://github.com/project-sunbird/knowledge-platform.git
+
+
+
-
+
0
0
@@ -49,31 +70,29 @@
-
-
- H/15 * * * *
- false
-
-
+
-
-
+
+
2
- https://github.com/project-sunbird/knowledge-platform.git
+ https://github.com/Sunbird-inQuiry/inquiry-api-service.git
- ${github_release_tag}
+ ${inquiry_release_tag}
+ false
+
+
build/assessment-service/Jenkinsfile
false
false
-
\ No newline at end of file
+
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/InquiryFlinkJob/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/InquiryFlinkJob/config.xml
new file mode 100644
index 0000000000..93b0eba8f7
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/InquiryFlinkJob/config.xml
@@ -0,0 +1,77 @@
+
+
+
+
+ hudson.model.ParametersDefinitionProperty
+ com.sonyericsson.rebuild.RebuildSettings
+
+
+
+
+ false
+
+
+
+ -1
+ 10
+ -1
+ 1
+
+
+
+
+ false
+ false
+
+
+
+
+ inquiry_release_tag
+ <font style="color:dimgray;font-size:14px;"><b>
+<li>To build from a tag, use refs/tags/github_tag</li>
+<li>To build from a branch, use refs/heads/github_branch</li>
+<li>The default value of ${inquiry_pipeline_branch_or_tag} will be the release / tag version set in global configuration</li>
+<li>To build from a differnt branch, replace the ${inquiry_pipeline_branch_or_tag} with your branch</li>
+</b></font>
+ refs/heads/${inquiry_pipeline_branch_or_tag}
+ true
+
+
+
+
+ 0
+ 0
+
+ false
+ project
+ false
+
+
+
+
+
+
+
+
+
+ 2
+
+
+ https://github.com/Sunbird-inQuiry/data-pipeline.git
+
+
+
+
+ ${inquiry_release_tag}
+
+
+ false
+
+
+
+ kubernetes/pipelines/build/Jenkinsfile
+ false
+
+
+ false
+
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InquiryFlinkJob/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InquiryFlinkJob/config.xml
new file mode 100644
index 0000000000..af888dbe75
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InquiryFlinkJob/config.xml
@@ -0,0 +1,149 @@
+
+
+
+
+ hudson.model.ParametersDefinitionProperty
+ com.sonyericsson.rebuild.RebuildSettings
+
+
+
+
+ false
+
+
+
+ -1
+ 10
+ -1
+ 2
+
+
+
+
+ false
+ false
+
+
+
+
+ private_branch
+
+ choice-parameter-2544395024638227
+ 1
+
+ true
+
+
+
+ true
+
+
+ InquiryFlinkJob
+ Deploy/dev/KnowledgePlatform/InquiryFlinkJob
+
+
+ ET_FORMATTED_HTML
+ true
+
+
+ inquiry_release_tag
+ <font style="color:dimgray;font-size:14px;"><b>
+<li>To build from a tag, use refs/tags/github_tag</li>
+<li>To build from a branch, use refs/heads/github_branch</li>
+<li>The default value of ${inquiry_pipeline_branch_or_tag} will be the release / tag version set in global configuration</li>
+<li>To build from a differnt branch, replace the ${inquiry_pipeline_branch_or_tag} with your branch</li>
+</b></font>
+ refs/heads/${inquiry_pipeline_branch_or_tag}
+ false
+
+
+ image_tag
+ <font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font>
+
+ false
+
+
+ absolute_job_path
+ <font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font>
+ ArtifactUpload/dev/KnowledgePlatform/InquiryFlinkJob
+ false
+
+
+ job_names_to_deploy
+ <font color=green size=2><b>Choose the job names to deploy. Multi-selection is available.</b></font>
+ choice-parameter-1273072434092073
+ 1
+
+ true
+
+
+
+ true
+
+
+ InquiryFlinkJob
+ Deploy/dev/KnowledgePlatform/InquiryFlinkJob
+
+
+ PT_MULTI_SELECT
+ false
+ 1
+
+
+
+
+ 0
+ 0
+
+ false
+ project
+ false
+
+
+
+
+
+
+
+
+
+ 2
+
+
+ https://github.com/Sunbird-inQuiry/data-pipeline.git
+
+
+
+
+ ${inquiry_release_tag}
+
+
+ false
+
+
+
+ true
+ false
+
+ 0
+ false
+
+
+
+ kubernetes/pipelines/deploy/Jenkinsfile
+ false
+
+
+ false
+
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/InquiryUploadSchema/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/InquiryUploadSchema/config.xml
new file mode 100644
index 0000000000..7441f81065
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/InquiryUploadSchema/config.xml
@@ -0,0 +1,163 @@
+
+
+
+ false
+
+
+
+ -1
+ -1
+ -1
+ 5
+
+
+
+
+ false
+ false
+
+
+
+
+ private_branch
+
+ choice-parameter-2544395024638227
+ 1
+
+ true
+
+
+
+ true
+
+
+ InquiryUploadSchema
+ Deploy/dev/Kubernetes/InquiryUploadSchema
+
+
+ ET_FORMATTED_HTML
+ true
+
+
+ branch_or_tag
+
+ choice-parameter-2620434998790477
+ 1
+
+ true
+
+
+
+ true
+
+
+ InquiryUploadSchema
+ Deploy/dev/Kubernetes/InquiryUploadSchema
+
+
+ ET_FORMATTED_HTML
+ true
+
+
+ schema_repo
+ <font color=dimgray size=2><b>Enter the repo url from which schema folder to be uploaded</b></font>
+
+
+ https://github.com/Sunbird-inQuiry/inquiry-api-service.git
+ https://github.com/project-sunbird/knowledge-platform.git
+
+
+
+
+ schema_repo_branch_or_tag
+ <font color=dimgray size=2><b>Enter the branch or tag for schema repo</b></font>
+
+ false
+
+
+ source_folder
+
+ choice-parameter-5348290139923778
+ 1
+
+ true
+
+
+
+ true
+
+
+ InquiryUploadSchema
+ Deploy/dev/Kubernetes/InquiryUploadSchema
+
+
+ PT_MULTI_SELECT
+ false
+ 1
+
+
+
+
+ 0
+ 0
+
+ false
+ project
+ false
+
+
+
+
+
+
+
+
+
+ 2
+
+
+ https://github.com/project-sunbird/sunbird-devops.git
+
+
+
+
+ ${branch_or_tag}
+
+
+ false
+
+
+
+ true
+ false
+
+ 0
+ false
+
+
+
+ pipelines/upload/schema/knowledge-platform/schema.Jenkinsfile
+ false
+
+
+ false
+
diff --git a/kubernetes/ansible/bootstrap.yaml b/kubernetes/ansible/bootstrap.yaml
index 0fa7e0acfe..72f1beacff 100644
--- a/kubernetes/ansible/bootstrap.yaml
+++ b/kubernetes/ansible/bootstrap.yaml
@@ -39,7 +39,7 @@
- name: "Tagging {{ namespace }} to enable istio"
shell: "kubectl label namespaces {{ namespace }} istio-injection=enabled --overwrite"
- name: Creating docker secrets
- shell: "kubectl create secret docker-registry {{ imagepullsecrets }} --namespace {{ namespace }} --docker-server {{ vault_docker_registry_url }} --docker-username {{ vault_docker_registry_user }} --docker-password {{ vault_docker_registry_password }} --dry-run=client -o=yaml | kubectl apply -f -"
+ shell: "kubectl create secret docker-registry {{ imagepullsecrets }} --namespace {{ namespace }} --docker-server {{ vault_docker_registry_url }} --docker-username {{ vault_docker_registry_user }} --docker-password '{{ vault_docker_registry_password }}' --dry-run=client -o=yaml | kubectl apply -f -"
- name: Installing reloader for configmaps reload
shell: helm upgrade --install --atomic reloader ../helm_charts/core/reloader --namespace "{{ namespace }}" -f /tmp/helm_vars.yaml
roles:
diff --git a/kubernetes/ansible/bootstrap_minimal.yaml b/kubernetes/ansible/bootstrap_minimal.yaml
index 44170246ae..cdb145423e 100644
--- a/kubernetes/ansible/bootstrap_minimal.yaml
+++ b/kubernetes/ansible/bootstrap_minimal.yaml
@@ -30,7 +30,7 @@
- logging
ignore_errors: yes
- name: Creating docker secrets
- shell: "kubectl create secret docker-registry {{ imagepullsecrets }} --namespace {{ item }} --docker-server {{ vault_docker_registry_url }} --docker-username {{ vault_docker_registry_user }} --docker-password {{ vault_docker_registry_password }} --dry-run=client -o=yaml | kubectl apply -f -"
+ shell: "kubectl create secret docker-registry {{ imagepullsecrets }} --namespace {{ item }} --docker-server {{ vault_docker_registry_url }} --docker-username {{ vault_docker_registry_user }} --docker-password '{{ vault_docker_registry_password }}' --dry-run=client -o=yaml | kubectl apply -f -"
when: imagepullsecrets|length > 0
with_items:
- "{{ bootstrap_namespace.split(',') }}"
diff --git a/kubernetes/ansible/namespace.yml b/kubernetes/ansible/namespace.yml
index bc62234c2c..bc38fab7d8 100644
--- a/kubernetes/ansible/namespace.yml
+++ b/kubernetes/ansible/namespace.yml
@@ -28,7 +28,7 @@
- "{{ bootstrap_namespace.split(',') }}"
ignore_errors: yes
- name: Creating docker secrets
- shell: "kubectl create secret docker-registry {{ imagepullsecrets }} --namespace {{ item }} --docker-server {{ vault_docker_registry_url }} --docker-username {{ vault_docker_registry_user }} --docker-password {{ vault_docker_registry_password }} --dry-run=client -o=yaml | kubectl apply -f -"
+ shell: "kubectl create secret docker-registry {{ imagepullsecrets }} --namespace {{ item }} --docker-server {{ vault_docker_registry_url }} --docker-username {{ vault_docker_registry_user }} --docker-password '{{ vault_docker_registry_password }}' --dry-run=client -o=yaml | kubectl apply -f -"
when: imagepullsecrets|length > 0
with_items:
- "{{ bootstrap_namespace.split(',') }}"