diff --git a/ansible/roles/artifacts-download-azure/tasks/main.yml b/ansible/roles/artifacts-download-azure/tasks/main.yml
index 820039c25a95700536eadd312038cdd0d7efe0c8..db79bc213fc8cfa87b5dfed18ee5bf39d5149aa9 100644
--- a/ansible/roles/artifacts-download-azure/tasks/main.yml
+++ b/ansible/roles/artifacts-download-azure/tasks/main.yml
@@ -4,5 +4,5 @@
- name: Download from azure blob storage
command: az storage blob download -c {{ artifacts_container }} --name {{ artifact }} -f {{ artifact_path }}
- async: 100
+ async: 3600
poll: 10
diff --git a/deploy/jenkins/jenkins-server-setup.sh b/deploy/jenkins/jenkins-server-setup.sh
index c7dd7d61ac9eb69b6a5351bb865fef7249c1b206..fd10cc99254012c2ebb07509e33775eba08590ef 100755
--- a/deploy/jenkins/jenkins-server-setup.sh
+++ b/deploy/jenkins/jenkins-server-setup.sh
@@ -81,5 +81,6 @@ usermod -aG docker jenkins
echo -e "\n\e[0;32m${bold}Creating bashrc for jenkins user ${normal}"
cp /etc/skel/.bashrc /var/lib/jenkins
+chown jenkins:jenkins /var/lib/jenkins/.bashrc
echo -e "\n\e[0;32m${bold}Installation complete. Please go to your jenkins URL and continue setup if this first run..${normal}"
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
index 5e532b85d9e8b1b6ed1dc2a2f59dd965340e028f..13e49b2c4021ba42d6ce691377b3d439a8f13ce4 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</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.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -32,14 +32,14 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<randomName>choice-parameter-9600649228560</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>return[
'JenkinsJob',
'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -57,7 +57,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<randomName>choice-parameter-9600651313765</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("JenkinsJob")) {
return """<input name="value" value="lastSuccessfulBuild" class="setting-input" type="text"><br> <font color=darkgreen size=2><b>OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.</b></font>"""
}
@@ -67,7 +67,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -84,7 +84,7 @@ return "<b>Not Applicable</b>"
<randomName>choice-parameter-9600653373369</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("ArtifactRepo")) {
return """<input name="value" value="" class="setting-input" type="text"> <br> <font color=red size=2><b>CAUTION: If the value is blank, artifact version will be taken from the latest metadata.json.</b></font>"""
}
@@ -93,7 +93,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -110,7 +110,7 @@ return "<b>Not Applicable</b>"
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (override_private_branch.equals("true")) {
return """<input name="value" value="${private_repo_branch}" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Change this value to checkout a different branch from private repository.</b></font>"""
}
@@ -118,7 +118,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -135,7 +135,7 @@ return """<b>This parameter is not used</b>"&quo
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (override_public_branch.equals("true")) {
return """<input name="value" value="" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Provide the tag or branch name to checkout the Jenkinsfile and codebase.<br>Note: The tag or branch name for this job should be taken from <a href="https://github.com/project-sunbird/sunbird-devops">project-sunbird/sunbird-devops</a></b></font></b></font>""";
@@ -144,7 +144,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -155,6 +155,12 @@ return """<b>This parameter is not used</b>"&quo
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
+ <hudson.model.StringParameterDefinition>
+ <name>sunbird_auth_branch_or_tag</name>
+ <description><font color=dimgray size=2><b>Provide the branch or tag of sunbird auth repo.</b></font></description>
+ <defaultValue></defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
@@ -181,7 +187,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>