diff --git a/deploy/jenkins/jenkins-jobs-setup.sh b/deploy/jenkins/jenkins-jobs-setup.sh
index 4cfb90ec72aa96d737cf2ce985d1e12501d92a56..834b5e652737820f5802352e69829f5f271b0790 100755
--- a/deploy/jenkins/jenkins-jobs-setup.sh
+++ b/deploy/jenkins/jenkins-jobs-setup.sh
@@ -22,7 +22,13 @@ setupJobs(){
find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type f -name config.xml -exec sed -i "s#ArtifactUpload/dev/#ArtifactUpload/${arr[0]}/#g" {} \;
find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type f -name config.xml -exec sed -i "s#Deploy/dev/#Deploy/${arr[0]}/#g" {} \;
fi
- find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type d -path "*Summary*" -prune -o -name config.xml -exec sed -i 's/<upstreamProjects>.*//g' {} \;
+ find $JENKINS_TMP/Deploy/jobs/${arr[0]} -type d -path "*Summary*" -prune -o -name config.xml -exec sed -i 's#<upstreamProjects>.*##g' {} \;
+ find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i 's#refs/heads/${public_repo_branch}##g' {} \;
+ find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i 's#use refs/tags/github_tag#specify the github tag#g' {} \;
+ find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i 's#use refs/heads/github_branch#specify the github branch#g' {} \;
+ find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i '/The default value of/d' {} \;
+ find $JENKINS_TMP/Build/jobs -type f -name config.xml -exec sed -i '/To build from a differnt branch/d' {} \;
+
echo -e "\e[0;33m${bold}Jobs created for ${arr[0]}${normal}"
for key in "${!arr[@]}"; do
@@ -33,19 +39,19 @@ setupJobs(){
cp -r $JENKINS_TMP/OpsAdministration/jobs/${arr[0]} $JENKINS_TMP/OpsAdministration/jobs/${arr[$key]}
cp -r $JENKINS_TMP/Deploy/jobs/${arr[0]} $JENKINS_TMP/Deploy/jobs/${arr[$key]}
find $JENKINS_TMP/Deploy/jobs/${arr[$key]} -type f -name config.xml -exec bash -c 'configPath=$0; jobPath=$(dirname $configPath); jobName=$(basename $jobPath); modulePath=${jobPath%/*/*}; moduleName=$(basename $modulePath); sed -i "s#ArtifactUpload/$1/$moduleName/.*<#Deploy/$2/$moduleName/$jobName<#g" $0' {} ${arr[0]} ${arr[$(($key - 1))]} \;
- find $JENKINS_TMP/Deploy/jobs/${arr[$key]} -type d -path "*Summary*" -prune -o -name config.xml -exec sed -i 's/<upstreamProjects>.*//g' {} \;
+ find $JENKINS_TMP/Deploy/jobs/${arr[$key]} -type d -path "*Summary*" -prune -o -name config.xml -exec sed -i 's#<upstreamProjects>.*##g' {} \;
find $JENKINS_TMP/Deploy/jobs/${arr[$key]}/jobs/Summary/jobs/DeployedVersions -type f -name config.xml -exec sed -i "s#Deploy/${arr[0]}/#Deploy/${arr[$key]}/#g" {} \;
echo -e "\e[0;33m${bold}Jobs created for ${arr[$key]}${normal}"
done
echo -e "\e[0;36m${bold}Do you want to disable auto trigger of build jobs based on new commits?${normal}"
read -p 'y/n: ' choice
if [[ $choice == "y" ]]; then
- find $JENKINS_TMP/Build -type f -name config.xml -exec sed -i 's/<spec>.*<\/spec>/<spec><\/spec>/g' {} \;
+ find $JENKINS_TMP/Build -type f -name config.xml -exec sed -i 's#<spec>.*</spec>#<spec></spec>#g' {} \;
fi
echo -e "\e[0;36m${bold}Do you want to disable daily backup jobs (Ex: DB backups)?${normal}"
read -p 'y/n: ' choice
if [[ $choice == "y" ]]; then
- find $JENKINS_TMP/OpsAdministration -type f -name config.xml -exec sed -i 's/<spec>.*<\/spec>/<spec><\/spec>/g' {} \;
+ find $JENKINS_TMP/OpsAdministration -type f -name config.xml -exec sed -i 's#<spec>.*</spec>#<spec></spec>#g' {} \;
fi
diffs=$(colordiff -r --suppress-common-lines --no-dereference -x 'nextBuildNumber' -x 'builds' -x 'last*' /var/lib/jenkins/jobs $JENKINS_TMP | wc -l)
if [[ $diffs -eq 0 ]]; then
diff --git a/deploy/jenkins/jenkins-plugins-setup.sh b/deploy/jenkins/jenkins-plugins-setup.sh
index b6956c7df946ea1fea0345bfedac12db38ec61f6..ad3851378df6bb9afe833823d553fa190ea77d78 100755
--- a/deploy/jenkins/jenkins-plugins-setup.sh
+++ b/deploy/jenkins/jenkins-plugins-setup.sh
@@ -4,23 +4,28 @@ 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_new.zip
-unzip m2_new.zip
+wget https://sunbirdpublic.blob.core.windows.net/installation/m2-slim.tar
+tar -xf m2-slim.tar
mv .m2 /var/lib/jenkins
chown -R jenkins:jenkins /var/lib/jenkins/.m2
+else
+wget https://sunbirdpublic.blob.core.windows.net/installation/m2-slim.tar
+tar -xf m2-slim.tar
+cp -rf .m2/* /var/lib/jenkins/.m2/
+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/jenkins-plugins-new.zip
-unzip jenkins-plugins-new.zip
+wget https://sunbirdpublic.blob.core.windows.net/installation/plugins.tar
+tar -xf plugins.tar
mv plugins /var/lib/jenkins/
chown -R jenkins:jenkins /var/lib/jenkins/plugins
else
-wget https://sunbirdpublic.blob.core.windows.net/installation/jenkins-plugins-new.zip
-unzip jenkins-plugins-new.zip
+wget https://sunbirdpublic.blob.core.windows.net/installation/plugins.tar
+tar -xf plugins.tar
cp -rf plugins/* /var/lib/jenkins/plugins/
chown -R jenkins:jenkins /var/lib/jenkins/plugins
fi
-echo -e "\n\e[0;32m${bold}Go to manage jenkins -> Plugin manager -> Update center -> Check status of installation${normal}"
+echo -e "\n\e[0;32m${bold}Go to manage jenkins -> Plugin manager -> Update center -> Check status of installation OR Check the list of installed plugins${normal}"
diff --git a/deploy/jenkins/jenkins-server-setup.sh b/deploy/jenkins/jenkins-server-setup.sh
index cec51c4fd8f785368e84886b496b7bc79019fee1..7ea5b17cd5670bb2d5e3321c3ebffefc891aa021 100755
--- 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.263.1
+apt-get install -y jenkins=2.263.4
echo -e "\n\e[0;32m${bold}Installating PIP${normal}"
apt-get install -y python-pip
@@ -66,7 +66,7 @@ ln -s /usr/local/lib/node-v6.17.1-linux-x64/bin/gulp /usr/bin/gulp
rm -rf node-v6.17.1-linux-x64*
echo -e "\n\e[0;32m${bold}Installating Ansible${normal}"
-pip install ansible==2.7.18
+pip install ansible==2.5.2
echo -e "\n\e[0;32m${bold}Installating azure cli${normal}"
apt-get install ca-certificates curl apt-transport-https lsb-release gnupg
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml
index 92618cba962f72c6132bd317b68ff0d74bfe0605..56424f5bf3807e368ba600e923f30b26d08c35ad 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/config.xml
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.15">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+ <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.25">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.16"/>
+ <registry plugin="docker-commons@1.17"/>
</org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Assessment/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Assessment/config.xml
index dc2b9069b73349fd3647f34cbb1e14cfc5a82fab..57fd20755108bd7fcacc632660eef4447fb423e1 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Assessment/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Assessment/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -50,7 +50,7 @@ ArtifactRepo - Push the docker image to container registry.
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -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.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Content/config.xml
index 3cd813b454f0de1d2edf7c20d5c8ee5d7d1d2edf..5919c15e3f9f02d5fd8470e55a8f7ac833f78bee 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Content/config.xml
@@ -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.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Dial/config.xml
similarity index 92%
rename from deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
rename to deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Dial/config.xml
index 103b8d979e25a0ad18f8b2492d506a6b0ed64ca6..0de239fd7bddb5533fb874de3aeb4c4a3bde93a4 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Dial/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -28,7 +28,7 @@
<hudson.model.StringParameterDefinition>
<name>absolute_job_path</name>
<description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>Build/Core/UserOrg</defaultValue>
+ <defaultValue>Build/Core/Dial</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
@@ -50,7 +50,7 @@ ArtifactRepo - Push the docker image to container registry.
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -64,7 +64,7 @@ ArtifactRepo - Push the docker image to container registry.
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec/>
- <upstreamProjects>/Build/Core/UserOrg</upstreamProjects>
+ <upstreamProjects>/Build/Core/Dial</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.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/DiscussionsMW/config.xml
similarity index 92%
rename from deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml
rename to deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/DiscussionsMW/config.xml
index 6e2ea4303735970418caf005008ab0b6a19a72f7..6eac98442d6357ba52cce31866bec203d392d83f 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/DiscussionsMW/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -28,7 +28,7 @@
<hudson.model.StringParameterDefinition>
<name>absolute_job_path</name>
<description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>Build/Core/Badger</defaultValue>
+ <defaultValue>Build/Core/DiscussionsMiddleware</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
@@ -50,7 +50,7 @@ ArtifactRepo - Push the docker image to container registry.
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -64,7 +64,7 @@ ArtifactRepo - Push the docker image to container registry.
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec/>
- <upstreamProjects>/Build/Core/Badger</upstreamProjects>
+ <upstreamProjects>Build/Core/DiscussionsMiddleware</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.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
index 825932b1b9f4865f9b25cbf0ff3d94ddb71d7730..d6b675bfb0a1af1b86d770666f56c03255ca8f2f 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -15,7 +15,7 @@
<daysToKeep>-1</daysToKeep>
<numToKeep>10</numToKeep>
<artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>1</artifactNumToKeep>
+ <artifactNumToKeep>5</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -50,7 +50,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
index b8352ba7773285cc461e70145cd2b2ebd405ed94..dc35c777baa2f4b495abcedaf8a1358d645c96f7 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -50,7 +50,7 @@ ArtifactRepo - Push the docker image to container registry.
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -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.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Nodebb/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Nodebb/config.xml
index e74f85cc5a663663606f93ac3475459ff07ce945..4887782fae65834a548572ffa5b2e4bea5a80abc 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Nodebb/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Nodebb/config.xml
@@ -1,13 +1,14 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<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>
@@ -34,7 +35,7 @@
<hudson.model.StringParameterDefinition>
<name>image_tag</name>
<description><font color=darkgreen size=2><b>OPTIONAL: Specify the tag to upload a specific image version to the container registry.</b></font></description>
- <defaultValue/>
+ <defaultValue></defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
@@ -50,20 +51,20 @@ ArtifactRepo - Push the docker image to container registry.
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
+ <paramsToUseForLimit></paramsToUseForLimit>
+ <configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
- <spec/>
+ <spec></spec>
<upstreamProjects>/Build/Core/Nodebb</upstreamProjects>
<threshold>
<name>SUCCESS</name>
@@ -75,8 +76,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.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -94,7 +95,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>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/NodebbUI/config.xml
similarity index 79%
rename from deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml
rename to deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/NodebbUI/config.xml
index a68c1ef3a9545005064284caacbe2de00643e01c..07421d92e6b2f2c6840a3b73c36f2c73aa4d76cf 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/NodebbUI/config.xml
@@ -1,21 +1,14 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
+ <actions/>
<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/>
@@ -28,7 +21,7 @@
<hudson.model.StringParameterDefinition>
<name>absolute_job_path</name>
<description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>Build/Core/OfflineInstaller</defaultValue>
+ <defaultValue>Build/Core/NodebbUI</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
@@ -64,7 +57,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec/>
- <upstreamProjects>Build/Core/OfflineInstaller</upstreamProjects>
+ <upstreamProjects>/Build/Core/NodebbUI</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -90,19 +83,11 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
+ <extensions/>
</scm>
- <scriptPath>pipelines/upload/artifacts/Jenkinsfile</scriptPath>
+ <scriptPath>pipelines/upload/plugins/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml
index d14adf080f3cd4b64ccb927165c7628f7d9f2459..5d18ec991c0e2d435301c54bb858b153c178d937 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -50,7 +50,7 @@ ArtifactRepo - Push the docker image to container registry.
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -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.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/SparkHdclusterExporter/config.xml
similarity index 91%
rename from deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml
rename to deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/SparkHdclusterExporter/config.xml
index 874765187c01e16d066feb96dbb84573347c760d..a6e1211e9ffdc4b6fe608f31dc3c869f96b23332 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/SparkHdclusterExporter/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -28,7 +28,7 @@
<hudson.model.StringParameterDefinition>
<name>absolute_job_path</name>
<description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>Build/Core/Config</defaultValue>
+ <defaultValue>Build/Core/SparkHdclusterExporter</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
@@ -50,7 +50,7 @@ ArtifactRepo - Push the docker image to container registry.
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -64,7 +64,7 @@ ArtifactRepo - Push the docker image to container registry.
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec/>
- <upstreamProjects>/Build/Core/Config</upstreamProjects>
+ <upstreamProjects>/Build/Core/SparkHdclusterExporter</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.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -95,7 +95,7 @@ ArtifactRepo - Push the docker image to container registry.
<shallow>true</shallow>
<noTags>false</noTags>
<reference/>
- <depth>1</depth>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
index 82bdc7efcba8bd5026506460a76d83e7f2ea4d0d..e559caff7ccfed2386bce41c33775bb72803ee7e 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
@@ -80,7 +80,7 @@ ArtifactRepo - Push the docker image to container registry.
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-devops.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
index d05493d86c7f0cc65e45c29df4715f16e8235cd9..78602a563a34dcaf359601c855475c56fe17a2e6 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -50,7 +50,7 @@ ArtifactRepo - Push the docker image to container registry.
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -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.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
index 953421f039250e9ac852838c77e4d7cafd148a1c..590eab1e268d255a978d2dd4089b56dde2b3255a 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -80,7 +80,7 @@ ArtifactRepo - Push the docker image to container registry.
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-devops.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
index b3ae96700e4ca2e5b0ad3572c291f059d92d17b5..855324d31a9b26667ac79e87ea352d218a8b0fdb 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -50,7 +50,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
index 4742bdefff015b4c17f163525556ce4c9927ed2d..1aa83cd9de46c98427587161b35211bfc7dc7ff5 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -50,7 +50,7 @@ ArtifactRepo - Push the docker image to container registry.
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -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.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
index 8f979780016deebb76a9fdb6aa5be4cbce998726..274954ef2c8237ea857b0c097169a888c4d29802 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index 4d6a32c8567198c17931ea54b0c60b1f6be3b0ff..ab7ab561946e1e736acd57cd6bfccedfcad4b6af 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -75,8 +75,8 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Build/config.xml b/deploy/jenkins/jobs/Build/config.xml
index e794546f97853f8c6d5beb4f144c697fe25f8645..b4e3e19ff5dfa0b5e0ad064b3f331b262a084e05 100644
--- a/deploy/jenkins/jobs/Build/config.xml
+++ b/deploy/jenkins/jobs/Build/config.xml
@@ -1,8 +1,18 @@
<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.14">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
<actions/>
<description></description>
- <properties/>
+ <properties>
+ <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+ <dockerLabel></dockerLabel>
+ <registry plugin="docker-commons@1.16"/>
+ </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
+ <org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty plugin="config-file-provider@3.6.3">
+ <configs class="sorted-set">
+ <comparator class="org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty$1"/>
+ </configs>
+ </org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty>
+ </properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
<views>
<hudson.model.AllView>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/config.xml
index 92618cba962f72c6132bd317b68ff0d74bfe0605..56424f5bf3807e368ba600e923f30b26d08c35ad 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/config.xml
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.15">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+ <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.25">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.16"/>
+ <registry plugin="docker-commons@1.17"/>
</org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
index e0d29e22d789931e2cd56aef0745291a8ff2268f..4383f266e9b2013bac23ab3816ca7ef031935df1 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
<description/>
<keepDependencies>false</keepDependencies>
@@ -11,13 +11,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -27,9 +32,17 @@
<paramsToUseForLimit/>
</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>
+ </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -41,13 +54,10 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions/>
</scm>
<scriptPath>images/kong/Jenkinsfile.build</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho/config.xml
deleted file mode 100644
index a441e6b66c107561219b20bb83fe54bf70315bee..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho/config.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.67">
- <script>node(){
- build_tag="1.5.0-gold"
- name="echo-server"
- node=env.NODE_NAME
- org=env.hub_org
-
- sh """
- docker pull sunbird/echo-server:1.5.0-gold
- docker tag sunbird/echo-server:1.5.0-gold ${org}/echo-server:${build_tag}
- """
-writeFile file: 'metadata.json', text: '{ "image_name" : "echo-server", "image_tag" : "' + build_tag + '", "node_name" : "' + node + '"}'
-
- archiveArtifacts artifacts: 'metadata.json', onlyIfSuccessful: true
-}</script>
- <sandbox>true</sandbox>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho_Backup/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho_Backup/config.xml
deleted file mode 100644
index a441e6b66c107561219b20bb83fe54bf70315bee..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManagerEcho_Backup/config.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.67">
- <script>node(){
- build_tag="1.5.0-gold"
- name="echo-server"
- node=env.NODE_NAME
- org=env.hub_org
-
- sh """
- docker pull sunbird/echo-server:1.5.0-gold
- docker tag sunbird/echo-server:1.5.0-gold ${org}/echo-server:${build_tag}
- """
-writeFile file: 'metadata.json', text: '{ "image_name" : "echo-server", "image_tag" : "' + build_tag + '", "node_name" : "' + node + '"}'
-
- archiveArtifacts artifacts: 'metadata.json', onlyIfSuccessful: true
-}</script>
- <sandbox>true</sandbox>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
index a26017e13d0b12c309ebcb905e2f3d5b2329426a..dcf74fa0450bea7ea2b2a8b0a9e57907935d9265 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/AdminUtils/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -69,4 +79,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
index 1f6d5991a5050c1feb7d5e67276e49f26121690d..5bc1fe4d3443d668851a877b41ad71fb6282a96c 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Analytics/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -26,13 +26,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -43,11 +48,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -59,17 +69,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
index 96d35d3ab4a4e97d85c16debc4d547481fa70ca6..9f448b2a561c61f7773b742ad96fd451c92efd72 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/ApiManagerEcho/config.xml
@@ -20,9 +20,14 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
@@ -37,7 +42,12 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
@@ -53,17 +63,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
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 f23ff671d61909db553e82a4136288cc953e974f..d2c038b5fa0c458f4323c61eb43105c566847c24 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 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -60,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>build/assessment-service/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
deleted file mode 100644
index 5b20171528b88aeab879a5b81754bb12f0cc2f11..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
- <actions>
- <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/>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>1</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.80">
- <script>node(){
- build_tag="1.8.0-gold"
- name="badger"
- node=env.NODE_NAME
- org=env.hub_org
-
- sh """
- docker pull sunbird/${name}:${build_tag}
- docker tag sunbird/${name}:${build_tag} ${org}/${name}:${build_tag}
- """
-writeFile file: 'metadata.json', text: '{ "image_name" : "' + name + '", "image_tag" : "' + build_tag + '", "node_name" : "' + node + '"}'
-
- archiveArtifacts artifacts: 'metadata.json', onlyIfSuccessful: true
-}</script>
- <sandbox>true</sandbox>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ce5cfac72e6a531065f9056d80c0619d88f75068
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Bot/config.xml
@@ -0,0 +1,98 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+ <actions>
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+ <jobPropertyDescriptors>
+ <string>hudson.model.ParametersDefinitionProperty</string>
+ <string>com.sonyericsson.rebuild.RebuildSettings</string>
+ </jobPropertyDescriptors>
+ </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+ </actions>
+ <description/>
+ <keepDependencies>false</keepDependencies>
+ <properties>
+ <jenkins.model.BuildDiscarderProperty>
+ <strategy class="hudson.tasks.LogRotator">
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>10</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>1</artifactNumToKeep>
+ </strategy>
+ </jenkins.model.BuildDiscarderProperty>
+ <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <autoRebuild>false</autoRebuild>
+ <rebuildDisabled>false</rebuildDisabled>
+ </com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <hudson.model.StringParameterDefinition>
+ <name>github_release_tag</name>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>private_bot_tag</name>
+ <description><font color=red size=2><b> If the value is blank, master branch will be copied from bot private repo. Specify github tag name to build from a tag <br>
+ keep empty to build from master <br>
+ <br>
+ keep empty if there is no bot private repo <br>
+ </b></font></description>
+ <defaultValue/>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.ChoiceParameterDefinition>
+ <name>private_bot_repo</name>
+ <description><font color=red size=3><b> keep empty if there is no bot private repo</description>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string/>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
+ </parameterDefinitions>
+ </hudson.model.ParametersDefinitionProperty>
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
+ <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+ <throttleEnabled>false</throttleEnabled>
+ <throttleOption>project</throttleOption>
+ <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+ <paramsToUseForLimit/>
+ </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>
+ </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+ </properties>
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+ <configVersion>2</configVersion>
+ <userRemoteConfigs>
+ <hudson.plugins.git.UserRemoteConfig>
+ <url>https://github.com/project-sunbird/sunbird-bot.git</url>
+ </hudson.plugins.git.UserRemoteConfig>
+ </userRemoteConfigs>
+ <branches>
+ <hudson.plugins.git.BranchSpec>
+ <name>${github_release_tag}</name>
+ </hudson.plugins.git.BranchSpec>
+ </branches>
+ </scm>
+ <scriptPath>bot/Jenkinsfile</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
index e93b6d0fbdc378700f8b900d2a2d8a6482947dc9..48ecbcc819db70a34ddf131f801a5482f720cda9 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -52,8 +57,8 @@
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -65,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
index 949257c004c3fcef31e26b614c175337fed1e149..6360409b1a6ec024564f37cdf61a1723dc5df57c 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraDecrypt/config.xml
@@ -27,9 +27,14 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>cassandra_jar_name</name>
@@ -54,7 +59,12 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
@@ -70,17 +80,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile.decrypt</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
index 4c4a7e1b007fe7eaab8380943c71bc129899519f..06f2f4ea0e447d609d8d7957403516aed183f5e8 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraStateValidated/config.xml
@@ -28,9 +28,14 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
@@ -44,7 +49,12 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
index 1c1e1a1ef40dfe6f026116bcc85eb03daae3ded0..32304f7ab8185e6465f8b8eda536e6f42ba49849 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
@@ -28,9 +28,14 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
<org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>public_branch</name>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
index 74e5873c355abd6fc794688001dd3f1e37587cf6..88e131aac8699288600bfcf6a208637804375675 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cert/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=blue size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -60,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
index d226d54c016ada2f7ed4330a19879ea964baa6de..ef47dc9a9030592881ddf00d875dcd5dcb6001bd 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CertRegistryService/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=blue size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml
deleted file mode 100644
index 8fc15e8756f54f34ff06233d4a3915787b6078ed..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>1</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</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">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </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> </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">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-cloud-storage-sdk.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>true</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
index 7def9cac2aa9f87bd2e787b9ac253176a4f5426f..7b47e1972e6394a4eb17eb3f4ee8e2dab02a1986 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -62,15 +72,7 @@
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
+ <extensions/>
</scm>
<scriptPath>build/content-service/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml
similarity index 70%
rename from deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
rename to deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml
index c05a06a6b702943dee6fa682ae91213f21965b88..81f62c3fb9cbdeab17f9965c26ce8aaae353bed7 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/OfflineInstaller/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Dial/config.xml
@@ -27,9 +27,14 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
@@ -44,37 +49,31 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/Sunbird-Ed/SunbirdEd-portal</url>
+ <url>https://github.com/project-sunbird/sunbird-dial-service.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
- <scriptPath>Jenkinsfile.desktop</scriptPath>
+ <scriptPath>build/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
index 3c75acdec916e608433f5f91e154567b4bdce885..dfdc502b88809b95e3aa38ff65aefe4562e99ceb 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/DiscussionsMiddleware/config.xml
@@ -27,13 +27,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -42,44 +47,36 @@
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit/>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
+
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<hudson.triggers.SCMTrigger>
- <spec>15 * * * *</spec>
+ <spec>H/15 * * * *</spec>
<ignorePostCommitHooks>false</ignorePostCommitHooks>
</hudson.triggers.SCMTrigger>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/Sunbird-Ed/discussions-middleware</url>
+ <url>https://github.com/Sunbird-Ed/discussions-middleware.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
+ <extensions/>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
index 1113115faf85c24bcd5348e3aee1e23edd83bef5..d49f350a817b66ade6d58bb9ab9a284f3b24d3b7 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/EncService/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -26,26 +27,37 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+ <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/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -63,7 +75,7 @@
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
index aaf6e8d80e637892fe6f9a7b10de62373db726d1..9e67e22b91a2dd87b14b308f9ff9021a0e2b516c 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Groups/config.xml
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,7 +49,12 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
@@ -58,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml
index 1f7728a619c7aa4c7dd9439133cbe608428fe486..ac673ecdda680bbac5216736f79b5b274aa59b4f 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Hawkeye-superset/config.xml
@@ -20,9 +20,14 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
@@ -58,17 +63,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
index c4f17ac8c729e404f552c548f9691716f3cd593e..48ed8d59f54b3b6135387c0efcfd4414c77de5c4 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
<description/>
<keepDependencies>false</keepDependencies>
@@ -20,13 +20,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -45,8 +50,8 @@
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +63,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>keycloak/scripts/pipelines/sunbird-auth-build/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml
index edf3983a7271b3420a49dacaaf611fce27c0acf2..6523b7b6230d37ea7519b35eb2585abd0eb28120 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/KnowledgeMW/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
<description/>
<keepDependencies>false</keepDependencies>
@@ -20,13 +20,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -35,11 +42,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -51,17 +63,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
index 8d26ae1f1ac9c75d91327f23d23970624c0d8196..2cdac260adf509e15fe536427524adc64f4e8111 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -60,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
index 4aa49ef4da7378e0ab5345bea65719f1090deb57..89116c8406be03a83b273bca69cb9cffafea2bd6 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Lms/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
index f02fabb463b4f483eb78660083d57510a43b8fa3..bbe33dacb0d4726c0aa7fadedf404e4b795ca88f 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Nodebb/config.xml
@@ -20,19 +20,24 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>nodebb_branch</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
+ <description/>
+ <defaultValue>master</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -43,15 +48,20 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+ <url>https://github.com/project-sunbird/sunbird-nodebb.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
@@ -61,17 +71,9 @@
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
+ <extensions/>
</scm>
- <scriptPath>pipelines/build/nodebb/Jenkinsfile</scriptPath>
+ <scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
diff --git a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml
similarity index 60%
rename from deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/jobs/Content/config.xml
rename to deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml
index 3cf2aa50ee1d306162a1c17041d25561f33bd7ab..2f090a4c1ffc38cdfe63aad6a9c1cfcb430f418f 100644
--- a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/NodebbUI/config.xml
@@ -1,12 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
- <actions>
- <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>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+ <actions/>
<description/>
<keepDependencies>false</keepDependencies>
<properties>
@@ -27,13 +20,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,15 +42,20 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/knowledge-platform.git</url>
+ <url>https://github.com/Sunbird-Ed/discussions-UI.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
@@ -60,19 +63,8 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
- <scriptPath>functional-tests/content/Jenkinsfile</scriptPath>
+ <scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
index 6116cd04f23d9b48b941f56ef51be6389474e083..91d5a612fe7e08ffdb654a880df23800b247be8a 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Notification/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=blue size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
index a7ec059293b4b4ddca3aa219693fefa7140b0e43..1e29cff894cbd2ae710be13f4010864f04351fa9 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,27 +27,14 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>sunbird_content_editor_artifact_url</name>
- <description><font color=dimgray size=2><b>Blob URL for content editor zip file</b></font></description>
- <defaultValue>https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/content-editor-iframe-3.0.0.zip</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>sunbird_collection_editor_artifact_url</name>
- <description><font color=dimgray size=2><b>Blob URL for collection editor zip file</b></font></description>
- <defaultValue>https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/collection-editor-iframe-3.0.0.zip</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>sunbird_generic_editor_artifact_url</name>
- <description><font color=dimgray size=2><b>Blob URL for generic editor zip file</b></font></description>
- <defaultValue>https://sunbirddev.blob.core.windows.net/sunbird-content-dev/artefacts/editor/generic-editor-iframe-2.9.0.zip</defaultValue>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>buildDockerImage</name>
@@ -77,7 +64,9 @@
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -86,15 +75,20 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/Sunbird-Ed/SunbirdEd-portal</url>
+ <url>https://github.com/Sunbird-Ed/SunbirdEd-portal.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
@@ -104,15 +98,7 @@
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
+ <extensions/>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlayerCustomStage/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlayerCustomStage/config.xml
deleted file mode 100644
index 133012369df9ab5e02c6caa2dc17840e728784a1..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlayerCustomStage/config.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
- <actions/>
- <description/>
- <keepDependencies>false</keepDependencies>
- <properties>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.80">
- <script>node(){
-ansiColor('xterm') {
- String ANSI_GREEN = "\u001B[32m"
- String ANSI_NORMAL = "\u001B[0m"
- String ANSI_BOLD = "\u001B[1m"
- String ANSI_RED = "\u001B[31m"
- String ANSI_YELLOW = "\u001B[33m"
- buildNumber = params.build_number
- try {
- copyArtifacts projectName: params.absolute_job_path, fingerprintArtifacts: true, flatten: true, selector: specific(buildNumber)
- }
- catch (err) {
- println ANSI_YELLOW + ANSI_BOLD + "Ok that failed!. Lets try an alertnative.." + ANSI_NORMAL
- copyArtifacts projectName: params.absolute_job_path, flatten: true, selector: upstream()
- }
- stage('ArchiveArtifacts') {
- archiveArtifacts "metadata.json"
- currentWs = sh(returnStdout: true, script: 'pwd').trim()
- image_tag = sh(returnStdout: true, script: 'jq -r .image_tag metadata.json').trim()
- agent = sh(returnStdout: true, script: 'jq -r .node_name metadata.json').trim()
- image_name = sh(returnStdout: true, script: 'jq -r .image_name metadata.json').trim()
- commit_hash = sh(returnStdout: true, script: 'jq -r .commit_hash metadata.json').trim()
- values = [:]
- values.put('image_name', image_name)
- values.put('image_tag', image_tag)
- values.put('commit_hash', commit_hash)
- cdn_file_exists = new File("$currentWs/index_cdn.ejs")
- if (cdn_file_exists.exists()) {
- archiveArtifacts "index_cdn.ejs, cdn_assets.zip"
- }
- currentBuild.description = "${values.image_tag}"
- }
-}
-}</script>
- <sandbox>true</sandbox>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml
index 0317d4a8bdf368d65050590eb692f59631260134..48da6a502d9d9d370d13ddf239e8c3487844effc 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Print/config.xml
@@ -20,13 +20,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -35,7 +42,12 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
@@ -51,17 +63,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
index d6a7b60a56a8ffe653a1dd6cf288af4e532bc718..d595a2ad00e59301413d85b643d347c53f6afe39 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
@@ -1,6 +1,7 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions/>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -20,28 +21,37 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -59,7 +69,7 @@
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
index ca135323c0d4b124a5d23e6c34c688406e7fba05..ff518db7c1c565c8783f40da4373402f56dd9a72 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Report/config.xml
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,7 +49,12 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
@@ -50,7 +62,7 @@
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-report-service</url>
+ <url>https://github.com/project-sunbird/sunbird-report-service.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
@@ -58,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1511d693022929acd8547a69e25592e35defe6cc
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Router/config.xml
@@ -0,0 +1,98 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
+ <actions>
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+ <jobPropertyDescriptors>
+ <string>hudson.model.ParametersDefinitionProperty</string>
+ <string>com.sonyericsson.rebuild.RebuildSettings</string>
+ </jobPropertyDescriptors>
+ </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+ </actions>
+ <description/>
+ <keepDependencies>false</keepDependencies>
+ <properties>
+ <jenkins.model.BuildDiscarderProperty>
+ <strategy class="hudson.tasks.LogRotator">
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>10</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>1</artifactNumToKeep>
+ </strategy>
+ </jenkins.model.BuildDiscarderProperty>
+ <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <autoRebuild>false</autoRebuild>
+ <rebuildDisabled>false</rebuildDisabled>
+ </com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <hudson.model.StringParameterDefinition>
+ <name>github_release_tag</name>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>private_bot_tag</name>
+ <description><font color=red size=2><b> If the value is blank, master branch will be copied from bot private repo. Specify github tag name to build from a tag <br>
+ keep empty to build from master <br>
+ <br>
+ keep empty if there is no bot private repo <br>
+ </b></font></description>
+ <defaultValue/>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.ChoiceParameterDefinition>
+ <name>private_bot_repo</name>
+ <description><font color=red size=3><b> keep empty if there is no bot private repo</description>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string/>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
+ </parameterDefinitions>
+ </hudson.model.ParametersDefinitionProperty>
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
+ <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+ <throttleEnabled>false</throttleEnabled>
+ <throttleOption>project</throttleOption>
+ <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+ <paramsToUseForLimit/>
+ </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>
+ </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+ </properties>
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
+ <configVersion>2</configVersion>
+ <userRemoteConfigs>
+ <hudson.plugins.git.UserRemoteConfig>
+ <url>https://github.com/project-sunbird/sunbird-bot.git</url>
+ </hudson.plugins.git.UserRemoteConfig>
+ </userRemoteConfigs>
+ <branches>
+ <hudson.plugins.git.BranchSpec>
+ <name>${github_release_tag}</name>
+ </hudson.plugins.git.BranchSpec>
+ </branches>
+ </scm>
+ <scriptPath>router/Jenkinsfile</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
index e5472de674d251e0698cf8359010e87fe0f0629b..f5aebc563912d341e066183d9eb6ae13e3c218f8 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Search/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>build/search-service/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml
similarity index 69%
rename from deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml
rename to deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml
index 94dd96265cd76f60d43a89667b058229e3a4bd21..03968468a6ce24df47201560ac57b060b0b641cf 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/PlatformCoursesFunctionalTest/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/SparkHdclusterExporter/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -45,22 +50,19 @@
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
- <hudson.triggers.TimerTrigger>
- <spec>H 0 * * *</spec>
- </hudson.triggers.TimerTrigger>
<hudson.triggers.SCMTrigger>
- <spec>H 23 * * *</spec>
+ <spec>H/15 * * * *</spec>
<ignorePostCommitHooks>false</ignorePostCommitHooks>
</hudson.triggers.SCMTrigger>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-functional-tests.git</url>
+ <url>https://github.com/project-sunbird/sunbird-devops.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
@@ -68,19 +70,8 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
- <scriptPath>lms_service_api_test/Jenkinsfile</scriptPath>
+ <scriptPath>images/azure-ambari-prometheus-exporter/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
index d6845b1e75c9f64fa5dceca7f96a2051b4c2d10f..3bcf74d9b0f1fe9b143eafe5e96c82b916729b18 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Taxonomy/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>build/taxonomy-service/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
index 7d243557443d98b20af2f80e0f54a3b10739e1e9..0eeefa3a67a707b8e52e20967348e8838a1ee7d1 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,7 +49,12 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
@@ -58,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml
deleted file mode 100644
index e942a49066a03f1db4e55210e4134adbe1080ab8..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/UserOrg/config.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>1</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-user-service.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
index 903fc54bd391a5d5a3b750ec7eec30a292fbf213..73cc32f02e1a1669901479e2e637e16e906b22d6 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>pipelines/build/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml
index 7fadcf6e986bc164876d181d89a771c6fd96dee4..943ea3826d2230558f628420dbe87ae69d779f1e 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AdhocScripts/config.xml
@@ -1,5 +1,4 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
@@ -8,7 +7,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description></description>
+ <description/>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -20,22 +19,46 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <autoRebuild>false</autoRebuild>
+ <rebuildDisabled>false</rebuildDisabled>
+ </com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
+ <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+ <throttleEnabled>false</throttleEnabled>
+ <throttleOption>project</throttleOption>
+ <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+ <paramsToUseForLimit/>
+ </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -48,17 +71,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>python-scripts/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
index b5f6fe737dc21d0c6c7691c0b4e5d3dbaead62b9..e6a0502a9349fa9471d055a6f35ceb8de4bae3d0 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
@@ -1,14 +1,13 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+ <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>
@@ -20,21 +19,45 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <autoRebuild>false</autoRebuild>
+ <rebuildDisabled>false</rebuildDisabled>
+ </com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
+ <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+ <throttleEnabled>false</throttleEnabled>
+ <throttleOption>project</throttleOption>
+ <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+ <paramsToUseForLimit/>
+ </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <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>
@@ -47,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
index 6c0648ca69d81fcdb1a5e31e2ac2ac5b2c895830..2b9e72c45cefe675f04e43e921424bd46bddcc1d 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,15 +49,20 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-analytics-core</url>
+ <url>https://github.com/project-sunbird/sunbird-analytics-core.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
@@ -60,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml
index 49b4a521aa6668e4748553f803c4b7ea56cec59f..d38675727b2493d2fa4e1e1425613043f412ebcf 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/AnalyticsService/config.xml
@@ -1,14 +1,13 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+ <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>
@@ -20,21 +19,45 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <autoRebuild>false</autoRebuild>
+ <rebuildDisabled>false</rebuildDisabled>
+ </com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
+ <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+ <throttleEnabled>false</throttleEnabled>
+ <throttleOption>project</throttleOption>
+ <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+ <paramsToUseForLimit/>
+ </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <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>
@@ -47,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
index 2ba32367d999518236d7455884c0ea96cbb5e44a..07a30b3ffd4f37561ea161cf75cd70d78be35428 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ApiModule/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<flow-definition plugin="workflow-job@2.36">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,22 +20,45 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <autoRebuild>false</autoRebuild>
+ <rebuildDisabled>false</rebuildDisabled>
+ </com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
+ <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+ <throttleEnabled>false</throttleEnabled>
+ <throttleOption>project</throttleOption>
+ <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+ <paramsToUseForLimit></paramsToUseForLimit>
+ </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
index 550b6da99c82cc3144593958cc46202c87ef2dac..a458418b2490baa3895c23b970db96e837911d3a 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -60,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
index 0777c5d77f1d9b94160ae1504bd415c0bc765bb3..62906b155665ab816c7ad21cd2e3de47d95e1ed3 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
@@ -1,14 +1,13 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+ <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>
@@ -20,21 +19,45 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <autoRebuild>false</autoRebuild>
+ <rebuildDisabled>false</rebuildDisabled>
+ </com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
+ <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+ <throttleEnabled>false</throttleEnabled>
+ <throttleOption>project</throttleOption>
+ <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+ <paramsToUseForLimit/>
+ </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <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>
@@ -47,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>pipelines/build/data-pipeline/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
index 2cc421723442bd656ee5f4fab7980177e0226528..6b70a3a5ad6149b85631fdda043ed5aecf9d7865 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataReplay/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<flow-definition plugin="workflow-job@2.36">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,26 +20,49 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <autoRebuild>false</autoRebuild>
+ <rebuildDisabled>false</rebuildDisabled>
+ </com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
+ <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+ <throttleEnabled>false</throttleEnabled>
+ <throttleOption>project</throttleOption>
+ <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+ <paramsToUseForLimit></paramsToUseForLimit>
+ </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/sowmya-dixit/sunbird-data-products.git</url>
+ <url>https://github.com/Sunbird-Ed/sunbird-data-products.git</url>
<credentialsId>githubHarsha</credentialsId>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml
index 94e0a87ee1eb80496926951445f4d5998d0c1d53..197e507a7f3e713db7c178f543d323aa54157c26 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/ETLJobs/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
<description/>
<keepDependencies>false</keepDependencies>
@@ -11,13 +11,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -28,12 +33,12 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/sunbird-Ed/sunbird-data-products.git</url>
+ <url>https://github.com/Sunbird-Ed/sunbird-data-products.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml
index 4c52f1ccf3b1889f821304e4c8891790ddeb3b86..6a5415e44c645451a9794d4a374eb79f186d046b 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/EdDataProducts/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -60,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>data-products/build.Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
index 03719536006bd73c22080f0c8806118fa4c95791..8d7aacf706d434615eafa81643cfd2ec4910544d 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>kubernetes/pipelines/build/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
similarity index 80%
rename from deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml
rename to deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
index 842c70c411018a79bf76dc66f766bd31954719d5..d3833e584247a8ada56f1605596915c8e6469242 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -28,9 +28,14 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
@@ -42,7 +47,6 @@
<throttleOption>project</throttleOption>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
- <configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
@@ -50,14 +54,15 @@
<spec>H/15 * * * *</spec>
<ignorePostCommitHooks>false</ignorePostCommitHooks>
</hudson.triggers.SCMTrigger>
- </triggers> </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+ </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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-config.git</url>
+ <url>https://github.com/project-sunbird/sunbird-ml-workbench.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
@@ -81,5 +86,5 @@
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>true</disabled>
-</flow-definition>
+ <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
index e179860313fba16a259d3afd98ab3c0c28f363a3..83a55b40e96f990b1bf29cfb05d906f24930301d 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
@@ -1,14 +1,13 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+ <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>
@@ -20,21 +19,45 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <autoRebuild>false</autoRebuild>
+ <rebuildDisabled>false</rebuildDisabled>
+ </com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
+ <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+ <throttleEnabled>false</throttleEnabled>
+ <throttleOption>project</throttleOption>
+ <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+ <paramsToUseForLimit/>
+ </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <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>
@@ -47,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/config.xml
deleted file mode 100644
index 5be56a4e057771f36a9853e10466836ea20d7ada..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.8">
- <actions/>
- <description></description>
- <properties>
- <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
- <dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.14"/>
- </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
- </properties>
- <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
- <views>
- <hudson.model.AllView>
- <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
- <name>All</name>
- <filterExecutors>false</filterExecutors>
- <filterQueue>false</filterQueue>
- <properties class="hudson.model.View$PropertyList"/>
- </hudson.model.AllView>
- </views>
- <tabBar class="hudson.views.DefaultViewsTabBar"/>
- </folderViews>
- <healthMetrics>
- <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
- <nonRecursive>false</nonRecursive>
- </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
- </healthMetrics>
- <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
-</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/config.xml
deleted file mode 100644
index 37e2c9b17a36df9c322b1d8c5c5ea45d9198d74c..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
- <actions/>
- <description></description>
- <properties>
- <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.9">
- <dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.15"/>
- </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
- </properties>
- <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
- <views>
- <hudson.model.AllView>
- <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
- <name>All</name>
- <filterExecutors>false</filterExecutors>
- <filterQueue>false</filterQueue>
- <properties class="hudson.model.View$PropertyList"/>
- </hudson.model.AllView>
- </views>
- <tabBar class="hudson.views.DefaultViewsTabBar"/>
- </folderViews>
- <healthMetrics>
- <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
- <nonRecursive>false</nonRecursive>
- </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
- </healthMetrics>
- <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
-</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/config.xml
deleted file mode 100644
index 37e2c9b17a36df9c322b1d8c5c5ea45d9198d74c..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.9">
- <actions/>
- <description></description>
- <properties>
- <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.9">
- <dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.15"/>
- </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
- </properties>
- <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
- <views>
- <hudson.model.AllView>
- <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
- <name>All</name>
- <filterExecutors>false</filterExecutors>
- <filterQueue>false</filterQueue>
- <properties class="hudson.model.View$PropertyList"/>
- </hudson.model.AllView>
- </views>
- <tabBar class="hudson.views.DefaultViewsTabBar"/>
- </folderViews>
- <healthMetrics>
- <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
- <nonRecursive>false</nonRecursive>
- </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
- </healthMetrics>
- <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
-</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp1/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp1/config.xml
deleted file mode 100644
index 471add90f98e76aab30d0a54a4220f3795e12f2d..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp1/config.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.33">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>exp1</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <script>if (override_public_branch.equals("true")) {
-return """<input name="value" value="${public_repo_branch}" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Change this value to checkout Jenkinsfile from a different tag or branch.<br>Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.</b></font></b></font>""";
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>exp1</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <hudson.model.StringParameterDefinition>
- <name>portal_branch_name</name>
- <description></description>
- <defaultValue>release-2.2.0</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>portal_repo_url</name>
- <description></description>
- <defaultValue>https://github.com/Sunbird-Ed/SunbirdEd-portal.git</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.11.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/player-experiments/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp2/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp2/config.xml
deleted file mode 100644
index d8dcbf422df04be63855999830c8c63900264c18..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp2/config.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.33">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>exp2</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <script>if (override_public_branch.equals("true")) {
-return """<input name="value" value="${public_repo_branch}" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Change this value to checkout Jenkinsfile from a different tag or branch.<br>Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.</b></font></b></font>""";
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>exp2</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <hudson.model.StringParameterDefinition>
- <name>portal_branch_name</name>
- <description></description>
- <defaultValue>portal-experiments</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>portal_repo_url</name>
- <description></description>
- <defaultValue>https://github.com/G33tha/SunbirdEd-portal.git</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.11.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>${portal_repo_url}</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>Experiments/experiments.Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp3/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp3/config.xml
deleted file mode 100644
index 295f773de5775e697b44a2e3478868e597c2091e..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments/jobs/exp3/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><flow-definition>
- <actions/>
- <description/>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <triggers/>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition">
- <scriptPath>experiments/experiments.Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- <scm class="hudson.plugins.git.GitSCM">
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/G33tha/SunbirdEd-portal.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>portal-experiments</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <configVersion>2</configVersion>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <gitTool>Default</gitTool>
- </scm>
- </definition>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments_Job_Generator/config.xml b/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments_Job_Generator/config.xml
deleted file mode 100644
index 74790c6bfb4bf9dc5d3d96706fd68ac5fdb7b605..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/Experiments/jobs/dev/jobs/Experiments_Job_Generator/config.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<project>
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>experiment_job_name</name>
- <description>job name or experiment name</description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>repo_url</name>
- <description>ex : https://github.com/${account_name}/SunbirdEd-portal.git</description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>branch_name</name>
- <description></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- </properties>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <triggers/>
- <concurrentBuild>false</concurrentBuild>
- <builders>
- <javaposse.jobdsl.plugin.ExecuteDslScripts plugin="job-dsl@1.76">
- <scriptText>def jobname = "${experiment_job_name}"
-def repo = "${repo_url}"
-def branch = "${branch_name}"
-
-pipelineJob("Experiments/dev/Experiments/${jobname}") {
-
- definition {
- cpsScm {
- scm {
- git {
- remote { url(repo) }
- branches(branch)
- scriptPath('experiments/experiments.Jenkinsfile')
- }
- }
- }
- }
-}</scriptText>
- <usingScriptText>true</usingScriptText>
- <sandbox>false</sandbox>
- <ignoreExisting>false</ignoreExisting>
- <ignoreMissingFiles>false</ignoreMissingFiles>
- <failOnMissingPlugin>false</failOnMissingPlugin>
- <failOnSeedCollision>false</failOnSeedCollision>
- <unstableOnDeprecation>false</unstableOnDeprecation>
- <removedJobAction>IGNORE</removedJobAction>
- <removedViewAction>IGNORE</removedViewAction>
- <removedConfigFilesAction>IGNORE</removedConfigFilesAction>
- <lookupStrategy>JENKINS_ROOT</lookupStrategy>
- </javaposse.jobdsl.plugin.ExecuteDslScripts>
- </builders>
- <publishers/>
- <buildWrappers/>
-</project>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/config.xml b/deploy/jenkins/jobs/Build/jobs/FunctionalTests/config.xml
deleted file mode 100644
index fb78197ddd867fb7562c730d5fea8573f50faae5..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
- <description></description>
- <properties>
- <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
- <dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.16"/>
- </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
- </properties>
- <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
- <views>
- <hudson.model.AllView>
- <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
- <name>All</name>
- <filterExecutors>false</filterExecutors>
- <filterQueue>false</filterQueue>
- <properties class="hudson.model.View$PropertyList"/>
- </hudson.model.AllView>
- </views>
- <tabBar class="hudson.views.DefaultViewsTabBar"/>
- </folderViews>
- <healthMetrics>
- <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
- <nonRecursive>false</nonRecursive>
- </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
- </healthMetrics>
- <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
-</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/config.xml b/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/config.xml
deleted file mode 100644
index fb78197ddd867fb7562c730d5fea8573f50faae5..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/FunctionalTests/jobs/Core/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
- <description></description>
- <properties>
- <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
- <dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.16"/>
- </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
- </properties>
- <folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
- <views>
- <hudson.model.AllView>
- <owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
- <name>All</name>
- <filterExecutors>false</filterExecutors>
- <filterQueue>false</filterQueue>
- <properties class="hudson.model.View$PropertyList"/>
- </hudson.model.AllView>
- </views>
- <tabBar class="hudson.views.DefaultViewsTabBar"/>
- </folderViews>
- <healthMetrics>
- <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
- <nonRecursive>false</nonRecursive>
- </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
- </healthMetrics>
- <icon class="com.cloudbees.hudson.plugins.folder.icons.StockFolderIcon"/>
-</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
index e9c657cf3b71c74496c7e8bbd2cbd6516403a668..94f6e4be27ffae6cae0b52eb572f28d7e851627c 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/CassandraTrigger/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -27,26 +28,37 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+ <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/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -64,7 +76,7 @@
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
index fb61d20cc73c774089d28f1ec6e8804340b1620f..81f62c3fb9cbdeab17f9965c26ce8aaae353bed7 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Dial/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,15 +49,20 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-dial-service</url>
+ <url>https://github.com/project-sunbird/sunbird-dial-service.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
@@ -58,19 +70,8 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
- <scriptPath>Jenkinsfile</scriptPath>
+ <scriptPath>build/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
index 41a9eadcd69e7a637e1daa0d298260f7c8e0519d..11f30a0d3386d91545a10d55780ceacb019fd136 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -44,15 +49,21 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<url>https://github.com/project-sunbird/knowledge-platform-jobs.git</url>
+ <credentialsId>githubPassword</credentialsId>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
@@ -60,17 +71,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>kubernets/pipelines/build/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
index a33487e183ca9a7b27cb85ec75eacdcd2f850e8e..3fbdaecda53b0c485e61d3dbf4fddf8c83776f3a 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,9 +27,14 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>profile_id</name>
@@ -43,7 +48,9 @@
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -52,15 +59,20 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-learning-platform</url>
+ <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
@@ -68,17 +80,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>pipelines/build/learning/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LPFuntionalTest/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LPFuntionalTest/config.xml
deleted file mode 100644
index 8338d7a5cde441bbf401b384bdebe5411463cf07..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LPFuntionalTest/config.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>1</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>kp_service_url</name>
- <description></description>
- <defaultValue>http://11.2.4.22:8080/learning-service</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>kp_content_creator_password</name>
- <description></description>
- <defaultValue>password</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>kp_content_reviewer_password</name>
- <description></description>
- <defaultValue>password</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>kp_search_base_url</name>
- <description></description>
- <defaultValue>http://11.2.6.6/search</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>kp_dial_base_url</name>
- <description></description>
- <defaultValue>https://qa.ekstep.in/api</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>kp_dial_auth_key</name>
- <description></description>
- <defaultValue>eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiI2MzExMTYwNTMzOGY0Zjc5YTgwZTM3YjcyZjVjMmUwZiJ9.azmj_AHmndeJz0h6yIkOJz1XjeZR6Gzd-OrZzR66I0A</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>kp_cs_uri</name>
- <description></description>
- <defaultValue>http://11.2.6.6/content</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-functional-tests.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>kp_service_test/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LP_Decoupling_Test/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LP_Decoupling_Test/config.xml
deleted file mode 100644
index 288e7b050564c5be2552dad10b95c56745c0d4f1..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/LP_Decoupling_Test/config.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>1</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.ChoiceParameterDefinition>
- <name>profile_id</name>
- <description>Select the profile_id</description>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>platform-services</string>
- <string>learning-services</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/build/learning/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index e8f69cfc3ee66da4fb7784c878b5452852e7818f..c77b00f762d3cf2c8f98b81b6c93baefbd528e60 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,7 +49,12 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
@@ -58,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>pipelines/build/neo4j/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
index 0f8cf822dc742828798e0749fc5a0a92bede920a..fb25d449a6f81f2e987831bae13546792300cb27 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,11 +49,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -58,17 +70,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>pipelines/build/synctool/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index ff889ff7263c1ccfd1f09dfe973f6ae41616c7d1..e4ff68b85e0b689ab8860fd4d56b440d0440d212 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -27,13 +27,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/tags/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -42,15 +49,30 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <jenkins.triggers.ReverseBuildTrigger>
+ <spec/>
+ <upstreamProjects>KnowledgePlatform</upstreamProjects>
+ <threshold>
+ <name>SUCCESS</name>
+ <ordinal>0</ordinal>
+ <color>BLUE</color>
+ <completeBuild>true</completeBuild>
+ </threshold>
+ </jenkins.triggers.ReverseBuildTrigger>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-learning-platform</url>
+ <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
@@ -60,15 +82,7 @@
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
+ <extensions/>
</scm>
<scriptPath>pipelines/build/yarn/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
index 9349be357535ee6035d8cda9f0eb4deeb533de4f..5e64cccbca76580b33d87424545cc11d8adc48e0 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
<description/>
<keepDependencies>false</keepDependencies>
@@ -20,13 +20,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -37,11 +42,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -53,17 +63,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
index e59dc31c4bad788bbcd51a9e1d1153fd04c83b70..03169e685064b9b72d3c691c0cd190112d1e4450 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
<description/>
<keepDependencies>false</keepDependencies>
@@ -20,13 +20,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -37,11 +42,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -53,17 +63,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
index 2719e4d2798f321895e70e00c9d0c188b1f58f23..7c4d30358d89ef5bcc1eaaf9d4b39fffe5101f71 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
<description/>
<keepDependencies>false</keepDependencies>
@@ -20,13 +20,20 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
@@ -35,11 +42,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -51,17 +63,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
index b53b66fe22ea27ac34c8618edb58580f9be3225a..72d5fd8f48444fc3e6f6a319d9ee48acdd457793 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
<description/>
<keepDependencies>false</keepDependencies>
@@ -20,13 +20,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -37,11 +42,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -53,17 +63,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
index c1a37d63e27ffe49304a69f516d406972d3a985a..9437b816079352ca4f37e1bd35dcae3bcc9c24c5 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
<description/>
<keepDependencies>false</keepDependencies>
@@ -20,13 +20,18 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
+ <description><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>
+</b></font></description>
+ <defaultValue>refs/heads/${public_repo_branch}</defaultValue>
+ <trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -37,11 +42,16 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
+ <triggers>
+ <hudson.triggers.SCMTrigger>
+ <spec>H/15 * * * *</spec>
+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -53,17 +63,6 @@
<name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>false</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
</scm>
<scriptPath>Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
diff --git a/deploy/jenkins/jobs/Deploy/config.xml b/deploy/jenkins/jobs/Deploy/config.xml
index e794546f97853f8c6d5beb4f144c697fe25f8645..68477b8ac7421fc78d69182df3125c9ab3412fdf 100644
--- a/deploy/jenkins/jobs/Deploy/config.xml
+++ b/deploy/jenkins/jobs/Deploy/config.xml
@@ -1,8 +1,13 @@
<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.14">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
<actions/>
<description></description>
- <properties/>
+ <properties>
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
+ <dockerLabel></dockerLabel>
+ <registry plugin="docker-commons@1.13"/>
+ </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+ </properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
<views>
<hudson.model.AllView>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/config.xml
index ca27afff705d0451baa23e45521eebd069a68472..56424f5bf3807e368ba600e923f30b26d08c35ad 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/config.xml
+++ b/deploy/jenkins/jobs/Deploy/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.15">
<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.25">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.15"/>
- </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+ <registry plugin="docker-commons@1.17"/>
+ </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
<views>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
deleted file mode 100644
index 298ff2b71d835a15f0cbeb00d6c288761aa5e28e..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/AdminUtils</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.53">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>AdminUtils</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.53">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>AdminUtils</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Core/AdminUtils</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </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">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/adminutils/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Assessment/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Assessment/config.xml
deleted file mode 100644
index bd554ea42ee0d688f7f4761a5f29aedafe8a69ac..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Assessment/config.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Assessment</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Assessment</projectName>
- <projectFullName>Deploy/dev/Core/Assessment</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Assessment</projectName>
- <projectFullName>Deploy/dev/Core/Assessment</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Core/Assessment</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>release-2.7.0</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/assessment/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Badger/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Badger/config.xml
deleted file mode 100644
index 5bdde924e3cd74d20c82795cf11dce136bb20ae5..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Badger/config.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Badger</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Badger</projectName>
- <projectFullName>Deploy/dev/Core/Badger</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Badger</projectName>
- <projectFullName>Deploy/dev/Core/Badger</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>release-2.2.0_RC11</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/badger/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml
deleted file mode 100644
index e166158a8c008998d5b40b75f14bd8e2f48afc9b..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CF-QUML_Migration_Script/config.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
- <actions/>
- <description>Migration from QUML version 0.5 to QUML version 1.0</description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>kp_search_service_base_path</name>
- <description>kp_search_service_base_path http://11.2.6.6/search</description>
- <defaultValue>http://11.2.6.6/search</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>kp_learning_service_base_path</name>
- <description>kp_learning_service_base_path http://11.2.4.22:8080/learning-service</description>
- <defaultValue>http://11.2.4.22:8080/learning-service</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>kp_assessment_service_base_path</name>
- <description>kp_assessment_service_base_path: http://11.2.6.6/assessment</description>
- <defaultValue>http://11.2.6.6/assessment</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>kp_content_service_base_path</name>
- <description>kp_content_service_base_path http://11.2.6.6/content</description>
- <defaultValue>http://11.2.6.6/content</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>github_release_tag</name>
- <description><font color="red"><b>CAUTION: If the value is blank, latest code will be built. Specify github tag name to build from a tag</b></font></description>
- <defaultValue/>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
- </properties>
- <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>
- <url>https://github.com/Sunbird-Ed/SunbirdEd-portal.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>quml-mogration-2.10</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraDecrypt/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraDecrypt/config.xml
deleted file mode 100644
index f784ffd5a7f9b673bf66e3dc0f09a447752bf229..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraDecrypt/config.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-1</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>5</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/CassandraDecrypt</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
- <name>artifact_source</name>
- <description><font color=dimgray size=2><b>
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
- <randomName>choice-parameter-9600649228560</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.58">
- <script>return[
-'JenkinsJob',
-'ArtifactRepo'
-]</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>CassandraDecrypt</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>PT_SINGLE_SELECT</choiceType>
- <filterable>false</filterable>
- <filterLength>1</filterLength>
- </org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>build_number</name>
- <description></description>
- <randomName>choice-parameter-9600651313765</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>"""
-}
-else
-{
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>CassandraDecrypt</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>artifact_version</name>
- <description></description>
- <randomName>choice-parameter-9600653373369</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>"""
-}
-else {
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>CassandraDecrypt</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>CassandraDecrypt</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>CassandraDecrypt</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Core/CassandraDecrypt</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <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>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/cassandra-deploy/Jenkinsfile.decrypt</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml
deleted file mode 100644
index cf950946896ae4f9e277a704e200d5d4f528356d..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cert/config.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Cert</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Cert</projectName>
- <projectFullName>Deploy/dev/Core/Cert</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Cert</projectName>
- <projectFullName>Deploy/dev/Core/Cert</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Core/Cert</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/cert/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml
deleted file mode 100644
index ee1bfcb08547d921e7ee8c0dc986302934159021..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CertRegistryService/config.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/CertRegistryService</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>CertRegistryService</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>CertRegistryService</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Core/CertRegistryService</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/cert-registry-service/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml
deleted file mode 100644
index 40c3e9754b34da783f19d2433c7a75dd29e19081..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Config/config.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Config</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.53">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Config</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.53">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Config</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <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">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/config-service/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Content/config.xml
deleted file mode 100644
index 821fb2fbf0a9d13f76c9eea7e47ebbad0b382d83..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Content/config.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
- <actions>
- <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/>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Content</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>private_branch</name>
- <description/>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Content</projectName>
- <projectFullName>Deploy/dev/Core/Content</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>branch_or_tag</name>
- <description/>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Content</projectName>
- <projectFullName>Deploy/dev/Core/Content</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec/>
- <upstreamProjects>ArtifactUpload/dev/Core/Content</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <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>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>sc-1928</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/content/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml
deleted file mode 100644
index 307fc4c505f89a17c49c390353b9df7f7df01224..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/EncService/config.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/EncService</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>EncService</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>EncService</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Core/EncService</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <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>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/enc/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml
deleted file mode 100644
index bd98aec0fa63c43c7da4268b1efd2cd3412f8a84..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KafkaSetup/config.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
- <actions>
- <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/>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>private_branch</name>
- <description/>
- <randomName>choice-parameter-188157054642539</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KafkaSetup</projectName>
- <projectFullName>Deploy/dev/Core/KafkaSetup</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>branch_or_tag</name>
- <description/>
- <randomName>choice-parameter-188157057910170</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KafkaSetup</projectName>
- <projectFullName>Deploy/dev/Core/KafkaSetup</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_UNORDERED_LIST</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
- </properties>
- <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>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/kafka/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml
deleted file mode 100644
index 0038bd043cd8c4aa4b77dd790234d119657353b4..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakCustom/config.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-196487835595646</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KeycloakAddClients</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-196487838166797</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KeycloakAddClients</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- </properties>
- <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>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/keycloak/Jenkinsfile.custom</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakMigration/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakMigration/config.xml
deleted file mode 100644
index 0cdecbe4fc34e52938eb74d74becc6982c0e328c..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakMigration/config.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Keycloak</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
- <name>artifact_source</name>
- <description><font color=dimgray size=2><b>
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
- <randomName>choice-parameter-9600649228560</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <script>return[
-'JenkinsJob',
-'ArtifactRepo'
-]</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KeycloakMigration</projectName>
- <projectFullName>Deploy/dev/Core/KeycloakMigration</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>PT_SINGLE_SELECT</choiceType>
- <filterable>false</filterable>
- <filterLength>1</filterLength>
- </org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>build_number</name>
- <description></description>
- <randomName>choice-parameter-9600651313765</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-{
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KeycloakMigration</projectName>
- <projectFullName>Deploy/dev/Core/KeycloakMigration</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>artifact_version</name>
- <description></description>
- <randomName>choice-parameter-9600653373369</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else {
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KeycloakMigration</projectName>
- <projectFullName>Deploy/dev/Core/KeycloakMigration</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KeycloakMigration</projectName>
- <projectFullName>Deploy/dev/Core/KeycloakMigration</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>release-2.7.0</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions/>
- </scm>
- <scriptPath>pipelines/deploy/keycloak-migration/Jenkinsfile</scriptPath>
- <lightweight>true</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml
deleted file mode 100644
index 7eb30d0c183fee994e8d2b8fec4efbddd0de2107..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
- <actions>
- <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/>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>private_branch</name>
- <description/>
- <randomName>choice-parameter-186662917593857</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KeycloakRealm</projectName>
- <projectFullName>Deploy/dev/Core/KeycloakRealm</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>branch_or_tag</name>
- <description/>
- <randomName>choice-parameter-186662921061407</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KeycloakRealm</projectName>
- <projectFullName>Deploy/dev/Core/KeycloakRealm</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <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>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/keycloak-realm/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
deleted file mode 100644
index 46e23f702d15cb23aafa3fa0d608bb31e1fa66c1..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KnowledgeMW/config.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/KnowledgeMW</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KnowledgeMW</projectName>
- <projectFullName>Deploy/dev/Core/KnowledgeMW</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KnowledgeMW</projectName>
- <projectFullName>Deploy/dev/Core/KnowledgeMW</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Core/KnowledgeMW</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>release-2.9.0</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/knowledge-mw-service/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml
deleted file mode 100644
index c63aa7263c2e884b5d8f02062e4236ad7b26ebfc..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Lms/config.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
- <actions>
- <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/>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Lms</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>private_branch</name>
- <description/>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Lms</projectName>
- <projectFullName>Deploy/dev/Core/Lms</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>branch_or_tag</name>
- <description/>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Lms</projectName>
- <projectFullName>Deploy/dev/Core/Lms</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec/>
- <upstreamProjects>ArtifactUpload/dev/Core/Lms</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <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>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>summary-aggregate</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/lms/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml
index dcab0240de9ad5633ec80bf0f58dc6cc2c8d9839..c04722d0316fa1829aaf5738ff197874936dad37 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Monitoring/config.xml
@@ -102,8 +102,8 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -112,7 +112,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>sunbird-monitoring-release-3.5.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Notification/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Notification/config.xml
deleted file mode 100644
index 6594417008781b271d17cbf207dcef455d6084fc..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Notification/config.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Notification</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Notification</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Notification</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Core/Notification</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/notification/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml
deleted file mode 100644
index a122d804d296001703e02016b0c1891e22f3715d..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-117346587048120</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>OnboardAPIs</projectName>
- <projectFullName>Deploy/dev/Core/OnboardAPIs</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-117346594984751</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>OnboardAPIs</projectName>
- <projectFullName>Deploy/dev/Core/OnboardAPIs</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>release-2.7.0</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/am-onboard-apis/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardConsumers/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardConsumers/config.xml
deleted file mode 100644
index 44efa4f3e0633ccc3298ebe543b0ae77f5faa27b..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardConsumers/config.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-186788940114941</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>OnboardConsumers</projectName>
- <projectFullName>Deploy/dev/Core/OnboardConsumers</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-186788943531283</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>OnboardConsumers</projectName>
- <projectFullName>Deploy/dev/Core/OnboardConsumers</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>release-2.7.0</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/am-onboard-consumers/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml
deleted file mode 100644
index 1a32fe8014da3997f9d4ab61bca94786f00be767..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/PlayerCDN/config.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.38">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Player</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>PlayerCDN</projectName>
- <projectFullName>Deploy/dev/Core/PlayerCDN</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>PlayerCDN</projectName>
- <projectFullName>Deploy/dev/Core/PlayerCDN</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <hudson.model.StringParameterDefinition>
- <name>cdn_enable</name>
- <description><font color=dimgray size=2><b>Select true to enable CDN build, false to disable CDN build</b></font></description>
- <defaultValue>false</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- <configVersion>1</configVersion>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Core/Player</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <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>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/player-cdn/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Print/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Print/config.xml
deleted file mode 100644
index a59ba36bee8082f56bc9b9f07c2e376acebaee23..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Print/config.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Print</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Print</projectName>
- <projectFullName>Deploy/dev/Core/Print</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Print</projectName>
- <projectFullName>Deploy/dev/Core/Print</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Core/Print</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>release-2.7.0</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/print-service/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml
deleted file mode 100644
index 6867343613bc9e2bfd0ad3100e4e733c433a69ac..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
- <actions/>
- <description/>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Proxy</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue/>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>private_branch</name>
- <description/>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Proxy</projectName>
- <projectFullName>Deploy/dev/Core/Proxy</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>branch_or_tag</name>
- <description/>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Proxy</projectName>
- <projectFullName>Deploy/dev/Core/Proxy</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec/>
- <upstreamProjects>ArtifactUpload/dev/Core/Proxy</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <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>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/proxy/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml
deleted file mode 100644
index 915daeeb8def128b6ee3242b4c3ef4e71f3920aa..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ReloadContainerServices/config.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>service</name>
- <description><b color:"blue">All will reload proxy and kong, proxy will reload proxy container configs, kong will reload kong container configs</b></description>
- <defaultValue>proxy</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/reloadConfigurations/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
deleted file mode 100644
index 122d8aded61bfb4bb8c333788c729a49148f653c..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Telemetry</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Telemetry</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Telemetry</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Core/Telemetry</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/telemetry/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml
deleted file mode 100644
index ef548d986a076bb9577e53690d41ded4a554de2f..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description>Deploys Telemetry Logstash Service</description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-186827048551040</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.57">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.57">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>TelemetryLogstash</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-186827051364357</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.57">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.57">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>TelemetryLogstash</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/telemetry-logstash/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml
deleted file mode 100644
index 42e8c9e0e8ca8ed92d6c34684c648a156772ddaf..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadPortalLabel/config.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
- <actions/>
- <description/>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-1</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>5</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
- <name>private_branch</name>
- <description/>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.75">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.75">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>UploadPortalLabel</projectName>
- <projectFullName>Deploy/dev/Core/UploadPortalLabel</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
- <name>branch_or_tag</name>
- <description/>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.75">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.75">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>UploadPortalLabel</projectName>
- <projectFullName>Deploy/dev/Core/UploadPortalLabel</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <hudson.model.ChoiceParameterDefinition>
- <name>desktop_container</name>
- <description/>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>label</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
- <hudson.model.ChoiceParameterDefinition>
- <name>destination_path</name>
- <description/>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>all_labels_ta.json</string>
- <string>all_labels_bn.json</string>
- <string>all_labels_en.json</string>
- <string>all_labels_hi.json</string>
- <string>all_labels_kn.json</string>
- <string>all_labels_mr.json</string>
- <string>all_labels_te.json</string>
- <string>all_labels_ur.json</string>
- <string>all_labels_gu.json</string>
- <string>all_labels_ml.json</string>
- <string>all_labels_as.json</string>
- <string>all_labels_or.json</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
- <hudson.model.ChoiceParameterDefinition>
- <name>src_file_path</name>
- <description/>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>utils/portal/labels/all_labels_ta.json</string>
- <string>utils/portal/labels/all_labels_bn.json</string>
- <string>utils/portal/labels/all_labels_en.json</string>
- <string>utils/portal/labels/all_labels_hi.json</string>
- <string>utils/portal/labels/all_labels_kn.json</string>
- <string>utils/portal/labels/all_labels_mr.json</string>
- <string>utils/portal/labels/all_labels_te.json</string>
- <string>utils/portal/labels/all_labels_ur.json</string>
- <string>utils/portal/labels/all_labels_gu.json</string>
- <string>utils/portal/labels/all_labels_ml.json</string>
- <string>utils/portal/labels/all_labels_as.json</string>
- <string>utils/portal/labels/all_labels_or.json</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
- <hudson.model.ChoiceParameterDefinition>
- <name>tag</name>
- <description/>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>upload-label</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec/>
- <upstreamProjects/>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/desktop-faq/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
deleted file mode 100644
index c0cd9f5f4c66cd7f6bd25ec3323a52b4a673c589..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UserOrg/config.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/UserOrg</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>UserOrg</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>UserOrg</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Core/UserOrg</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <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>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/userorg/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml
deleted file mode 100644
index 10a02619bfefed4634fb085206469e924691e39b..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-1</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>5</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Yarn</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
- <name>artifact_source</name>
- <description><font color=dimgray size=2><b>
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
- <randomName>choice-parameter-9061667106947</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <script>return[
-'JenkinsJob',
-'ArtifactRepo'
-]</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Yarn</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>PT_SINGLE_SELECT</choiceType>
- <filterable>false</filterable>
- <filterLength>1</filterLength>
- </org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>build_number</name>
- <description></description>
- <randomName>choice-parameter-9061670571657</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>"""
-}
-else
-{
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Yarn</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>artifact_version</name>
- <description></description>
- <randomName>choice-parameter-9061673103864</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>"""
-}
-else {
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Yarn</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Yarn</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Yarn</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
- <name>job_names_to_deploy</name>
- <description><font color=green size=2><b>Choose the samza app names to deploy and this will kill the selected samza app and deploy them. Multi selection is available.</b></font></description>
- <randomName>choice-parameter-8026182213525059</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <script>return ['lms.user-account-merger_1',
-'lms.sso-account-updater_1',
-'lms.indexer_1',
-'lms.notification-job_1']</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Yarn</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>PT_MULTI_SELECT</choiceType>
- <filterable>false</filterable>
- <filterLength>1</filterLength>
- </org.biouno.unochoice.CascadeChoiceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/yarn/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/YarnOld/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/YarnOld/config.xml
deleted file mode 100644
index e14279a743555f718a98724eeac89325d5edfb33..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/YarnOld/config.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Yarn</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
- <name>artifact_source</name>
- <description><font color=dimgray size=2><b>
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
- <randomName>choice-parameter-9061667106947</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <script>return[
-'JenkinsJob',
-'ArtifactRepo'
-]</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Yarn</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>PT_SINGLE_SELECT</choiceType>
- <filterable>false</filterable>
- <filterLength>1</filterLength>
- </org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>build_number</name>
- <description></description>
- <randomName>choice-parameter-9061670571657</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>"""
-}
-else
-{
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Yarn</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>artifact_version</name>
- <description></description>
- <randomName>choice-parameter-9061673103864</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>"""
-}
-else {
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Yarn</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Yarn</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Yarn</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
- <name>job_names_to_deploy</name>
- <description><font color=green size=2><b>Choose the samza app names to deploy and this will kill the selected samza app and deploy them. Multi selection is available.</b></font></description>
- <randomName>choice-parameter-8026182213525059</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <script>return ['lms.user-account-merger_1',
-'lms.sso-account-updater_1',
-'lms.indexer_1']</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Yarn</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>PT_MULTI_SELECT</choiceType>
- <filterable>false</filterable>
- <filterLength>1</filterLength>
- </org.biouno.unochoice.CascadeChoiceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/yarn/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml
deleted file mode 100644
index bd1b7a06842915f04c069fab045c4c7071539b82..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlineInstaller/config.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>offlineInstaller</projectName>
- <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>offlineInstaller</projectName>
- <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <hudson.model.StringParameterDefinition>
- <name>sunbirded_installer_branch_or_tag</name>
- <description><font color=dimgray size=2><b>Provide the branch or tag of sunbirded offline installer repo [ <u>https://github.com/Sunbird-Ed/sunbird-desktop-app.git</u> ] for the build job.</b></font></description>
- <defaultValue>release-2.6.0</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.ChoiceParameterDefinition>
- <name>offline_installer_type</name>
- <description><font color=dimgray size=2><b>Choose the type of installer you wanted to build</b></font></description>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>linux64bit</string>
- <string>windows64bit</string>
- <string>windows32bit</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- <configVersion>1</configVersion>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>test</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/offlineinstaller/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest32/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest32/config.xml
deleted file mode 100644
index 5d2d3a18258d42a39479d6e7d5f42394c8992d41..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest32/config.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>offlinewindowstest32</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>offlinewindowstest32</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <hudson.model.StringParameterDefinition>
- <name>sunbirded_installer_branch_or_tag</name>
- <description><font color=dimgray size=2><b>Provide the branch or tag of sunbirded offline installer repo [ <u>https://github.com/Sunbird-Ed/sunbird-desktop-app.git</u> ] for the build job.</b></font></description>
- <defaultValue>release-2.1</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.ChoiceParameterDefinition>
- <name>offline_installer_type</name>
- <description><font color=dimgray size=2><b>Choose the type of installer you wanted to build</b></font></description>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>windows32bit</string>
- <string>windows64bit</string>
- <string>linux64bit</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/offlineinstaller/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest64/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest64/config.xml
deleted file mode 100644
index 137949d93ba3c30968c4e96d31976fde2058ade3..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/offlinewindowstest64/config.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.34">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>offlinewindowstest64</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.62">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.62">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>offlinewindowstest64</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <hudson.model.StringParameterDefinition>
- <name>sunbirded_installer_branch_or_tag</name>
- <description><font color=dimgray size=2><b>Provide the branch or tag of sunbirded offline installer repo [ <u>https://github.com/Sunbird-Ed/sunbird-desktop-app.git</u> ] for the build job.</b></font></description>
- <defaultValue>release-2.1</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.ChoiceParameterDefinition>
- <name>offline_installer_type</name>
- <description><font color=dimgray size=2><b>Choose the type of installer you wanted to build</b></font></description>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>windows64bit</string>
- <string>windows32bit</string>
- <string>linux64bit</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/offlineinstaller/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml
deleted file mode 100644
index 1292b42c032a98bbcc2a95a89e5c59589114b0b9..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/user-Keycloak/config.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Keycloak</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
- <name>artifact_source</name>
- <description><font color=dimgray size=2><b>
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
- <randomName>choice-parameter-9600649228560</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <script>return[
-'JenkinsJob',
-'ArtifactRepo'
-]</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>user-Keycloak</projectName>
- <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>PT_SINGLE_SELECT</choiceType>
- <filterable>false</filterable>
- <filterLength>1</filterLength>
- </org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>build_number</name>
- <description></description>
- <randomName>choice-parameter-9600651313765</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-{
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>user-Keycloak</projectName>
- <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>artifact_version</name>
- <description></description>
- <randomName>choice-parameter-9600653373369</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else {
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>user-Keycloak</projectName>
- <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>user-Keycloak</projectName>
- <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>user-Keycloak</projectName>
- <projectFullName>Deploy/dev/Core/user-Keycloak</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <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>release-1.15_RC9</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/keycloak/Jenkinsfile.user</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml
index 6a4f8d07e708420a9648f2eec50961c830fb8368..baaac54e2863003667284d3f34de60b30cebf6b9 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/config.xml
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.15">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+ <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.25">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.16"/>
+ <registry plugin="docker-commons@1.17"/>
</org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
@@ -35,7 +35,7 @@
<refreshFrequency>3</refreshFrequency>
<showPipelineDefinitionHeader>false</showPipelineDefinitionHeader>
</au.com.centrumsystems.hudson.plugin.buildpipeline.BuildPipelineView>
- <hudson.plugins.view.dashboard.Dashboard plugin="dashboard-view@2.12">
+ <hudson.plugins.view.dashboard.Dashboard plugin="dashboard-view@2.14">
<owner class="com.cloudbees.hudson.plugins.folder.Folder" reference="../../../.."/>
<name>dahs</name>
<filterExecutors>false</filterExecutors>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml
index 90b51247816bbbdca0b0b38c9dc83de0fa7d9131..1accb62018cca7ef73c3afa7f075861277da2818 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AdhocScripts/config.xml
@@ -204,7 +204,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.9.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
index 2a39d1b1f151fadf895f2671ea15ac0606b17195..a00904aee836a016dd98cc1ff73e23bac1ffe95b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
@@ -202,7 +202,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.7.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
index aaf1954e324adb06e4de35833e375835fa9a19d8..d651caa1a0326749d900cd1d71f38ebf619397a5 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsCore/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
<defaultValue>ArtifactUpload/dev/DataPipeline/AnalyticsCore</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-9061667106947</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>return[
'JenkinsJob',
'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>build_number</name>
<description/>
<randomName>choice-parameter-9061670571657</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -74,7 +74,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -86,13 +86,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>artifact_version</name>
<description/>
<randomName>choice-parameter-9061673103864</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -101,7 +101,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -113,13 +113,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -127,7 +127,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -139,13 +139,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
@@ -154,7 +154,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -170,7 +170,7 @@ return """<b>This parameter is not used</b>"""</script>
<name>module</name>
<description>
<font color=dimgray size=2><b>It will deploy only lpa_core_artifacts(analytics-core & analytics-framework) jar.</b></font></description>
- <defaultValue>framework</defaultValue>
+ <defaultValue>framework,framework-spark-cluster</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
@@ -181,7 +181,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -206,8 +206,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsPopulatePSQLConsumerChannelMapping/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsPopulatePSQLConsumerChannelMapping/config.xml
index 9b5f1d1ae92112d121c91b04918ca2a10cbf70c9..508a3e200318010d594e98b951226a2845cbac73 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsPopulatePSQLConsumerChannelMapping/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsPopulatePSQLConsumerChannelMapping/config.xml
@@ -124,7 +124,7 @@ return """<b>This parameter is not used</b>"""</script>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml
index c67809a5f3fef57b6315cddd9c1b0c8a475150e9..99c84de212b00b3ac780fb8fd1e9c1aecec9751e 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsReplayJobs/config.xml
@@ -43,6 +43,12 @@
</a>
</choices>
</hudson.model.ChoiceParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>job_id</name>
+ <description><font color=dimgray size=2><b>Specify the job id.</b></font></description>
+ <defaultValue/>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>batch_identifier</name>
<description><font color=dimgray size=2><b>Specify The BatchId to Generate report for specific batch</b></font>
@@ -127,17 +133,6 @@ return """<b>This parameter is not used</b>"""</script>
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <hudson.model.ChoiceParameterDefinition>
- <name>job_id</name>
- <description><font color=dimgray size=2><b>Specify the job id.</b></font></description>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>progress-exhaust</string>
- <string>userinfo-exhaust</string>
- <string>response-exhaust</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml
index f1b3a45ba2d8957e66474b6007d6720634e66342..b607b8870fd5509f4f43c397a1157adedd56f685 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsService/config.xml
@@ -202,7 +202,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.2.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsStartJobManager/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsStartJobManager/config.xml
index d59080aeb42b664266a38472611dd1a12c68e8b4..67095e7e8059a1ac9a4de1a15c94e936f90a45e4 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsStartJobManager/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsStartJobManager/config.xml
@@ -102,12 +102,12 @@ return """<b>This parameter is not used</b>"&quo
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/manjudr/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.8.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSubmitJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSubmitJobs/config.xml
index 99d97a99a4c360261fbec3f83842c0b51daedb33..70c3f69621e58e62564549e54e4ec3591ef1315a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSubmitJobs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSubmitJobs/config.xml
@@ -102,12 +102,12 @@ return """<b>This parameter is not used</b>"&quo
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/manjudr/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>dataproducts-ansible-changes</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
index 392e4f9837f07547a1bca705597c9a878b8a7dd0..ec2161179edbd4a0751dfad87f72a9eca0115721 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ApiModule/config.xml
@@ -150,12 +150,12 @@ return """<b>This parameter is not used</b>"&quo
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/manjudr/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>proxy-api</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml
index 312081ee3e0cbefe8109a944b7f641b41b7cfc56..2909fd2b3999966096a534eb57196910c64ff684 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CassandraDbUpdate/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.34">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -25,74 +26,71 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-188134496458577</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.62">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.62">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>CassandraDbUpdate</projectName>
- <projectFullName>Deploy/dev/DataPipeline/CassandraDbUpdate</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-188134511232202</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
+ <secureScript plugin="script-security@1.62">
+ <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.62">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>CassandraDbUpdate</projectName>
- <projectFullName>Deploy/dev/DataPipeline/CassandraDbUpdate</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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>
-
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -110,7 +108,7 @@ return """<b>This parameter is not used</b>"""</script>
<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>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
index f459c48329d4fb2c52467a569ebf6ee322ffc529..776ce8d4b7d74ea10890e786d7055bf021ece1c3 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/CoreDataProducts/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
<defaultValue>ArtifactUpload/dev/DataPipeline/CoreDataProducts</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-9061667106947</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>return[
'JenkinsJob',
'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>build_number</name>
<description/>
<randomName>choice-parameter-9061670571657</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -74,7 +74,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -86,13 +86,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>artifact_version</name>
<description/>
<randomName>choice-parameter-9061673103864</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -101,7 +101,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -113,13 +113,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -127,7 +127,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -139,13 +139,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
@@ -154,7 +154,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -180,7 +180,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -205,8 +205,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml
index 8f09be5bc682104120f37eff0b88e57c40aa2d3d..d9aae98183ba86932fba8a0c79e58a75980582d3 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -31,51 +32,51 @@
<defaultValue>ArtifactUpload/dev/DataPipeline/Analytics</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-9061667106947</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.66">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>DataProducts</projectName>
<projectFullName>Deploy/dev/DataPipeline/DataProducts</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>PT_SINGLE_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>build_number</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-9061670571657</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
{
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
@@ -86,23 +87,23 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>artifact_version</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-9061673103864</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else {
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
@@ -113,75 +114,74 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>DataProducts</projectName>
<projectFullName>Deploy/dev/DataPipeline/DataProducts</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
+ <secureScript plugin="script-security@1.66">
+ <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>DataProducts</projectName>
<projectFullName>Deploy/dev/DataPipeline/DataProducts</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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></spec>
<upstreamProjects>ArtifactUpload/dev/DataPipeline/AnalyticsCore</upstreamProjects>
<threshold>
<name>SUCCESS</name>
@@ -193,8 +193,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -212,7 +212,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayJob/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayJob/config.xml
index 2121bb596ba8985f6c7fc58c88d034d707e14d72..ccd62da7b03a42999b0490fe11b1a9bad8103f58 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayJob/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayJob/config.xml
@@ -125,12 +125,12 @@ return """<b>This parameter is not used</b>"&quo
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.8.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayScript/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayScript/config.xml
index 55e382d7aa05438366501869696d87220f6f4414..879ea624d57e529a2ed37cfbc953df94267fedaa 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayScript/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataReplayScript/config.xml
@@ -204,7 +204,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.8.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml
index 3d602c216fa0e06cde3e21d188116dc30707a14f..6dfcc534981257f4c9b31b742eeec060a3cd6890 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataproductsConfigUpdate/config.xml
@@ -114,12 +114,12 @@ return """<b>This parameter is not used</b>"""</script>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.10.1</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_Health_Check/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidHealthCheck/config.xml
similarity index 95%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_Health_Check/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidHealthCheck/config.xml
index 27e6b355db4fd318a72142ba21a11ac26170e173..044d599f999d902ee147ee99db68acf65798640c 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_Health_Check/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidHealthCheck/config.xml
@@ -42,12 +42,12 @@
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/RevathiKotla/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.8.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml
index 530f33936c45f2c80d03e92363386ab4d1918c60..559927605a78f7a17ecc283afb50e9b3587a3ad3 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestion/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -38,13 +38,13 @@ To stop task: [stop-task]
</a>
</choices>
</hudson.model.ChoiceParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-193684482193674</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -52,7 +52,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -64,13 +64,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-193684493817846</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
@@ -79,7 +79,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -91,9 +91,44 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
+ <name>ingestion_task_names</name>
+ <description><font color=green size=2><b>Choose the Ingestion task names . Multi selection is available.</b></font></description>
+ <randomName>choice-parameter-5103950750484326</randomName>
+ <visibleItemCount>1</visibleItemCount>
+ <script class="org.biouno.unochoice.model.GroovyScript">
+ <secureScript plugin="script-security@1.75">
+ <script>return ['telemetry_events',
+'summary_events',
+'telemetry_feedback_events',
+'offline_desktop']</script>
+ <sandbox>false</sandbox>
+ </secureScript>
+ <secureFallbackScript plugin="script-security@1.75">
+ <script/>
+ <sandbox>false</sandbox>
+ </secureFallbackScript>
+ </script>
+ <projectName>DruidIngestion</projectName>
+ <projectFullName>Deploy/dev/DataPipeline/DruidIngestion</projectFullName>
+ <parameters class="linked-hash-map"/>
+ <referencedParameters/>
+ <choiceType>PT_MULTI_SELECT</choiceType>
+ <filterable>false</filterable>
+ <filterLength>1</filterLength>
+ </org.biouno.unochoice.CascadeChoiceParameter>
+ <hudson.model.ChoiceParameterDefinition>
+ <name>cluster</name>
+ <description><font color=green size=2><b>Choose the cluster name.</b></font></description>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>raw</string>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -107,8 +142,8 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_ingestion_health_check/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestionHealthCheck/config.xml
similarity index 98%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_ingestion_health_check/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestionHealthCheck/config.xml
index f56940d479c012b46c39b77e5d4bf9427e65b7f0..974c02ec677a9c09c6c70f7df2e384b846d581ed 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_ingestion_health_check/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidIngestionHealthCheck/config.xml
@@ -47,7 +47,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.8.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_segment_health_check/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSegmentHealthCheck/config.xml
similarity index 98%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_segment_health_check/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSegmentHealthCheck/config.xml
index 5315e4d56302a0b4006e03b5e4cc57eef5b77d43..6355467edb6cea84bfb992addd539f70c6c01cc1 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Druid_segment_health_check/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSegmentHealthCheck/config.xml
@@ -51,7 +51,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.8.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSummaryMonthlyRollup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSummaryMonthlyRollup/config.xml
index cba7924d7cb98cdf56dd8620dfa9802262a4962e..c271716e2155852380a5626899424765d2aec2fd 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSummaryMonthlyRollup/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DruidSummaryMonthlyRollup/config.xml
@@ -51,7 +51,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.3.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLDruidContentIndexer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLDruidContentIndexer/config.xml
index 6d9f4e68aeb197b0de831ec6c248a5b1cb0eaaa8..fed3bfe3188c4f1b3ec5d25825e25d05dcf037c0 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLDruidContentIndexer/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLDruidContentIndexer/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
<defaultValue>Deploy/dev/DataPipeline/ETLJobs</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-9061667106947</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>return[
'JenkinsJob',
'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>build_number</name>
<description/>
<randomName>choice-parameter-9061670571657</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -74,7 +74,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -86,13 +86,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>artifact_version</name>
<description/>
<randomName>choice-parameter-9061673103864</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -101,7 +101,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -113,13 +113,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -127,7 +127,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -149,13 +149,13 @@ Default Druid content indexer job will run as cron.</b></font></desc
</a>
</choices>
</hudson.model.ChoiceParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
@@ -164,7 +164,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -188,7 +188,7 @@ If you select the "execute script from the invoke_type drop down then choose whi
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -206,8 +206,8 @@ If you select the "execute script from the invoke_type drop down then choose whi
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -216,7 +216,7 @@ If you select the "execute script from the invoke_type drop down then choose whi
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml
index 3951b1ca18b640de5a16639b6b236d53250f06b2..3b6260b2f86a05668083b77ea76344e85c1d30c5 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -55,21 +55,21 @@ If you select the "execute script from the invoke_type drop down then choose whi
</a>
</choices>
</hudson.model.ChoiceParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-9061667106947</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>return[
'JenkinsJob',
'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -82,13 +82,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>build_number</name>
<description/>
<randomName>choice-parameter-9061670571657</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -98,7 +98,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -110,13 +110,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>artifact_version</name>
<description/>
<randomName>choice-parameter-9061673103864</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -125,7 +125,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -137,13 +137,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -151,7 +151,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -163,13 +163,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
@@ -178,7 +178,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -192,7 +192,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -203,22 +203,11 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec/>
- <upstreamProjects>ArtifactUpload/dev/DataPipeline/ETLJobs</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
+ <triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLUserCacheIndexer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLUserCacheIndexer/config.xml
index 169267af786c49ddeefa561261b3a8a0fe438ecc..9c71585b48e31dbda6495a78b1942ec7d6c36e37 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLUserCacheIndexer/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/ETLUserCacheIndexer/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
<defaultValue>Deploy/dev/DataPipeline/ETLJobs</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-9061667106947</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>return[
'JenkinsJob',
'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>build_number</name>
<description/>
<randomName>choice-parameter-9061670571657</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -74,7 +74,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -86,13 +86,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>artifact_version</name>
<description/>
<randomName>choice-parameter-9061673103864</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -101,7 +101,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -113,13 +113,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -127,7 +127,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -149,13 +149,13 @@ user cache indexer script will run.</b></font></description>
</a>
</choices>
</hudson.model.ChoiceParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
@@ -164,7 +164,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -209,7 +209,7 @@ Please select the action deploy or execute script.</b></font></descr
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -227,8 +227,8 @@ Please select the action deploy or execute script.</b></font></descr
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml
index 800cf6995ec5a15a83aa4f2e6e8554ea16701e41..0bb50872f7a68c29e2699f5d2c62d73318c732dc 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/EdDataProducts/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
<defaultValue>ArtifactUpload/dev/DataPipeline/EdDataProducts</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-9061667106947</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>return[
'JenkinsJob',
'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>build_number</name>
<description/>
<randomName>choice-parameter-9061670571657</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -74,7 +74,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -86,13 +86,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>artifact_version</name>
<description/>
<randomName>choice-parameter-9061673103864</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -101,7 +101,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -113,13 +113,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -127,7 +127,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -139,13 +139,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
@@ -154,7 +154,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -180,7 +180,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -205,8 +205,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
index 37878bceb0a6bc58ffd0aab0908d2987fd73cf4b..3ab889cb6bb477cc232a9e18f0e3e97dc1dfbd2e 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/FlinkPipelineJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -39,7 +39,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -51,13 +51,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -66,7 +66,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -90,27 +90,28 @@ return """<b>This parameter is not used</b>"""</script>
<defaultValue>ArtifactUpload/dev/DataPipeline/FlinkPipelineJobs</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>job_names_to_deploy</name>
<description><font color=green size=2><b>Choose the job names to deploy. Multi-selection is available.</b></font></description>
<randomName>choice-parameter-1273072434092073</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>return['telemetry-extractor',
'pipeline-preprocessor',
+'de-normalization',
'druid-validator',
'assessment-aggregator',
'content-cache-updater',
-'de-normalization-primary',
-'de-normalization-secondary',
+'user-cache-updater',
'user-cache-updater-v2',
'summary-denormalization',
'error-denormalization',
+'ingest-router',
'device-profile-updater']</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -125,7 +126,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.CascadeChoiceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -139,17 +140,17 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/GraphitePrometheusExporter/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/GraphitePrometheusExporter/config.xml
index bfe7fe3b672d0172f609b5ae3199e24161eac272..d8ec229219d76f30dc1054a5ec233c70d2739886 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/GraphitePrometheusExporter/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/GraphitePrometheusExporter/config.xml
@@ -104,7 +104,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.3.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InfraMonitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InfraMonitoring/config.xml
deleted file mode 100644
index 957182101826c5e4a0822d28ddeb93eb5b0db830..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InfraMonitoring/config.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-188158799721702</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.57">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.57">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Monitoring</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-188158802464010</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.57">
- <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.57">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Monitoring</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects></upstreamProjects>
- <threshold>
- <name>FAILURE</name>
- <ordinal>2</ordinal>
- <color>RED</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/monitor/DataPipeline/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml
deleted file mode 100644
index 371779b6f3144fe19628d247526b35e613ced866..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/InternalKong/config.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/APIManager</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
- <name>artifact_source</name>
- <description><font color=dimgray size=2><b>
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
- <randomName>choice-parameter-9061667106947</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <script>return[
-'JenkinsJob',
-'ArtifactRepo'
-]</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>InternalKong</projectName>
- <projectFullName>Deploy/dev/DataPipeline/InternalKong</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>PT_SINGLE_SELECT</choiceType>
- <filterable>false</filterable>
- <filterLength>1</filterLength>
- </org.biouno.unochoice.CascadeChoiceParameter>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.ChoiceParameterDefinition>
- <name>option</name>
- <description></description>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>onboard-apis</string>
- <string>onboard-consumers</string>
- <string>deploy-internal-kong</string>
- <string>provision-kong-db</string>
- <string>bootstrap-swarm</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>InternalKong</projectName>
- <projectFullName>Deploy/dev/DataPipeline/InternalKong</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>InternalKong</projectName>
- <projectFullName>Deploy/dev/DataPipeline/InternalKong</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/ekstep/sunbird-devops.git</url>
- <credentialsId>githubPassword</credentialsId>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>release-2.10.0</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/internal-kong/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml
index e599b6964b6f24b1048d47fd7597ae7cf5be2a5d..dfb51077d6cd792ea367948a6f3d86dc9fbda519 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-188153004575082</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -39,7 +39,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -51,13 +51,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-188153015326365</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
@@ -66,7 +66,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -80,7 +80,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -91,17 +91,17 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/manjudr/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>flink-logstash-setup</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml
index aa1b537b89ccd45bdde21f80ae48b696e271e234..a2904cf39b6fd8dac17163e0b80f2bcc36f085a1 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -25,74 +26,73 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-188157054642539</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>KafkaSetup</projectName>
<projectFullName>Deploy/dev/DataPipeline/KafkaSetup</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-188157057910170</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
+ <secureScript plugin="script-security@1.66">
+ <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>KafkaSetup</projectName>
<projectFullName>Deploy/dev/DataPipeline/KafkaSetup</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_UNORDERED_LIST</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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>
-
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -110,7 +110,7 @@ return """<b>This parameter is not used</b>"""</script>
<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>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Logging/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Logging/config.xml
index 490a9ba60811c8ad329514db3745a22877c224d8..b3c1101d17f68e458a3c158be758b590f02b3a1c 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Logging/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Logging/config.xml
@@ -117,12 +117,12 @@ return """<b>This parameter is not used</b>"""</script>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/kaali09/sunbird-devops.git</url>
+ <url>https://github.com/project-sunbird/sunbird-devops.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.2.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/LoggingFileBeatsVM/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/LoggingFileBeatsVM/config.xml
index 6d70dacf019259866eb98c61c3702f8d33e3c8cc..44bbccf00dd03ce361bf994d3147e5aac38e80f4 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/LoggingFileBeatsVM/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/LoggingFileBeatsVM/config.xml
@@ -29,7 +29,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>LoggingFileBeatsVM</projectName>
- <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+ <projectFullName>Deploy/dev/DataPipeline/LoggingFileBeatsVM</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -56,7 +56,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>LoggingFileBeatsVM</projectName>
- <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+ <projectFullName>Deploy/dev/DataPipeline/LoggingFileBeatsVM</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>LoggingFileBeatsVM</projectName>
- <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+ <projectFullName>Deploy/dev/DataPipeline/LoggingFileBeatsVM</projectFullName>
<choiceType>PT_MULTI_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
@@ -124,7 +124,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>LoggingFileBeatsVM</projectName>
- <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+ <projectFullName>Deploy/dev/DataPipeline/LoggingFileBeatsVM</projectFullName>
<choiceType>PT_SINGLE_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
@@ -172,4 +172,4 @@ return """<b>This parameter is not used</b>"""</script>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
deleted file mode 100644
index 4772e037c5122ea4ab33b8ee208a44cea6fb3cbc..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=black size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/DataPipeline/ml-workbench</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, latest built image will be deployed.</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">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/DataPipeline/ml-workbench</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </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">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/ml-workbench/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml
deleted file mode 100644
index 2f345e87ea534bd6d435c2e494db24208d513963..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Monitoring/config.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description/>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
- <name>private_branch</name>
- <description/>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.75">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.75">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Monitoring</projectName>
- <projectFullName>Deploy/dev/DataPipeline/Monitoring</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
- <name>branch_or_tag</name>
- <description/>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.75">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.75">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>Monitoring</projectName>
- <projectFullName>Deploy/dev/DataPipeline/Monitoring</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <hudson.model.StringParameterDefinition>
- <name>tag</name>
- <description/>
- <defaultValue/>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>kubeconfigpath</name>
- <description/>
- <defaultValue>/var/lib/jenkins/secrets/dp-k8s.yml</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>release-3.5.0</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>kubernetes/pipelines/monitoring/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStart/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStart/config.xml
index 95b4d9536fef0b779d177575676ad5b6fb87e84b..826a5af2fea74e8e0b36f8a67eb20b96beff02dd 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStart/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStart/config.xml
@@ -111,12 +111,12 @@ return """<b>This parameter is not used</b>"""</script>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.3.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStop/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStop/config.xml
index 6af02c0417cb13504223f4a5f55b93547df80285..02eb14816a0c347ce0d1d75616a0532c390762f4 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStop/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/PipelineFlinkSummaryDenormStop/config.xml
@@ -111,12 +111,12 @@ return """<b>This parameter is not used</b>"""</script>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.3.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/RunReportJob/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/RunReportJob/config.xml
index 547afa21985d492f26abbbd8ce6d1d4102ed87fc..3d5fc41efcbeb43c6caecfbf8185316188702167 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/RunReportJob/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/RunReportJob/config.xml
@@ -102,12 +102,12 @@ return """<b>This parameter is not used</b>"""</script>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/RevathiKotla/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.2.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml
index 6256fb7ba02437a04939ac90e6a611a89f6329c6..211b54e447c3d33005abdeb0e5872506ef81bf04 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml
@@ -107,7 +107,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.9.1</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
index 293eb390e9a7987c8ecac134196deeef96abf5ff..2a813aae6331c8289ddc3f3c05ed77d878441ae3 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
@@ -1,22 +1,21 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<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>2</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -32,156 +31,157 @@
<defaultValue>ArtifactUpload/dev/DataPipeline/Secor</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-9061667106947</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
+ <secureScript plugin="script-security@1.75">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script></script>
+ <secureFallbackScript plugin="script-security@1.75">
+ <script/>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>Secor</projectName>
- <projectFullName>Deploy/dev/DataPipeline/Secor</projectFullName>
+ <projectName>SecorFlink</projectName>
+ <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
+ <referencedParameters/>
<choiceType>PT_SINGLE_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>build_number</name>
- <description></description>
+ <description/>
<randomName>choice-parameter-9061670571657</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
+ <secureScript plugin="script-security@1.75">
+ <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>"""
}
else
{
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script></script>
+ <secureFallbackScript plugin="script-security@1.75">
+ <script/>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>Secor</projectName>
- <projectFullName>Deploy/dev/DataPipeline/Secor</projectFullName>
+ <projectName>SecorFlink</projectName>
+ <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters>artifact_source</referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>artifact_version</name>
- <description></description>
+ <description/>
<randomName>choice-parameter-9061673103864</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
+ <secureScript plugin="script-security@1.75">
+ <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>"""
}
else {
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script></script>
+ <secureFallbackScript plugin="script-security@1.75">
+ <script/>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>Secor</projectName>
- <projectFullName>Deploy/dev/DataPipeline/Secor</projectFullName>
+ <projectName>SecorFlink</projectName>
+ <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters>artifact_source</referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
- <description></description>
+ <description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
+ <secureScript plugin="script-security@1.75">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.75">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>Secor</projectName>
- <projectFullName>Deploy/dev/DataPipeline/Secor</projectFullName>
+ <projectName>SecorFlink</projectName>
+ <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
+ <referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
- <description></description>
+ <description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
+ <secureScript plugin="script-security@1.75">
+ <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.75">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>Secor</projectName>
- <projectFullName>Deploy/dev/DataPipeline/Secor</projectFullName>
+ <projectName>SecorFlink</projectName>
+ <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
+ <referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<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>
+ <spec/>
<upstreamProjects>ArtifactUpload/dev/DataPipeline/Secor</upstreamProjects>
<threshold>
<name>SUCCESS</name>
@@ -193,8 +193,8 @@ 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.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -212,13 +212,13 @@ return """<b>This parameter is not used</b>"&quo
<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>
</extensions>
</scm>
- <scriptPath>pipelines/deploy/secor/Jenkinsfile</scriptPath>
+ <scriptPath>pipelines/deploy/secor/Jenkinsfile.flink</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SecorFlink/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SecorFlink/config.xml
deleted file mode 100644
index 619c3cac5d15fd06a132f1335398f9b5fab39dd5..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SecorFlink/config.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
- <actions>
- <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/>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/DataPipeline/Secor</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
- <name>artifact_source</name>
- <description><font color=dimgray size=2><b>
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
- <randomName>choice-parameter-9061667106947</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <script>return[
-'JenkinsJob',
-'ArtifactRepo'
-]</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>SecorFlink</projectName>
- <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>PT_SINGLE_SELECT</choiceType>
- <filterable>false</filterable>
- <filterLength>1</filterLength>
- </org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>build_number</name>
- <description/>
- <randomName>choice-parameter-9061670571657</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
-}
-else
-{
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>SecorFlink</projectName>
- <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>artifact_version</name>
- <description/>
- <randomName>choice-parameter-9061673103864</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
-}
-else {
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>SecorFlink</projectName>
- <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>private_branch</name>
- <description/>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>SecorFlink</projectName>
- <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
- <name>branch_or_tag</name>
- <description/>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>SecorFlink</projectName>
- <projectFullName>Deploy/dev/DataPipeline/SecorFlink</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec/>
- <upstreamProjects>ArtifactUpload/dev/DataPipeline/Secor</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <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>
- <url>https://github.com/maheshkumargangula/sunbird-data-pipeline.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>release-3.1.0</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference/>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/secor/Jenkinsfile.flink</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SubmitReportJob/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SubmitReportJob/config.xml
index 182356ec8e36bbced4297d4c7873b57f846ba133..9293f4f1bed149531ac1ae1de3730a5db0b868b1 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SubmitReportJob/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SubmitReportJob/config.xml
@@ -131,7 +131,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.10.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
index 1001dab76c35c42ef21f801352dfb67b55949a0c..fd78bae6439b4ad4521a7313eb9bad02f4bc9882 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
@@ -239,7 +239,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.10.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/config.xml
index 92618cba962f72c6132bd317b68ff0d74bfe0605..56424f5bf3807e368ba600e923f30b26d08c35ad 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/config.xml
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.15">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+ <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.25">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.16"/>
+ <registry plugin="docker-commons@1.17"/>
</org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml
index 0700be4aa4618dfe686e5ac9ee48a7cccfce7509..1c15d443ab2b5e7b58537d6631d8f5cd06858530 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraDbUpdate/config.xml
@@ -104,7 +104,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
index e4c0e725ca2ba6ddeef7b073e5bc165e50da4d40..8bfb4117f9811f041a99cd7cb8eaf2a567fcb62c 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Dial/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
<defaultValue>ArtifactUpload/dev/KnowledgePlatform/Dial</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-14760318274338</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>return[
'JenkinsJob',
'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>build_number</name>
<description/>
<randomName>choice-parameter-14760320375443</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -74,7 +74,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -86,13 +86,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>artifact_version</name>
<description/>
<randomName>choice-parameter-14760322347747</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -101,7 +101,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -113,13 +113,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -127,7 +127,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -139,13 +139,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
@@ -154,7 +154,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -168,7 +168,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -193,8 +193,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -203,7 +203,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
index 2ade746534e30b63fde39eb449f1fa1ada7c9d23..739b686035d1beca0d5bcb61ee7a647d362b0ac9 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -39,7 +39,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -51,13 +51,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -66,7 +66,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -90,22 +90,23 @@ return """<b>This parameter is not used</b>"""</script>
<defaultValue>ArtifactUpload/dev/KnowledgePlatform/FlinkJobs</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>job_names_to_deploy</name>
<description><font color=green size=2><b>Choose the job names to deploy. Multi-selection is available.</b></font></description>
<randomName>choice-parameter-1273072434092073</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>return['activity-aggregate-updater',
'relation-cache-updater',
'post-publish-processor',
-'post-certificate-processor',
-'certificate-generator',
-'certificate-pre-processor']</script>
+'video-stream-generator',
+'questionset-publish',
+'collection-certificate-generator',
+'collection-complete-post-processor']</script>
<sandbox>true</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -120,7 +121,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.CascadeChoiceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -134,17 +135,18 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+ <credentialsId>githubPassword</credentialsId>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>flink-fix</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InsertQRCode/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InsertQRCode/config.xml
index e8e72223a57e4c460e08645272aa563d3a7cf6ac..4c85b3e4bcdbace491adc6758a56f731a43ed1c2 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InsertQRCode/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/InsertQRCode/config.xml
@@ -117,7 +117,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.3.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml
index 6aba98d056c27b00868b2e0eaebc9325edbc8ee7..cf30e9f43a26eb091d1f8c31daab82a54f258b2f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-188161640748171</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -39,7 +39,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -51,13 +51,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-188161652021198</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
@@ -66,7 +66,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -80,7 +80,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -94,8 +94,8 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -104,7 +104,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
index a7e85c5622d6ee83934ee2c61e98d93ac8fa3130..94ae1e8701efecb249ccc1a39ccfabbe4883852f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
@@ -193,8 +193,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -203,7 +203,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.5.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/LoggingFileBeatsVM/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/LoggingFileBeatsVM/config.xml
index 6d70dacf019259866eb98c61c3702f8d33e3c8cc..e39966704ec20dab20607997c2c36f43a2e4bc41 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/LoggingFileBeatsVM/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/LoggingFileBeatsVM/config.xml
@@ -29,7 +29,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>LoggingFileBeatsVM</projectName>
- <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+ <projectFullName>Deploy/dev/KnowledgePlatform/LoggingFileBeatsVM</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -56,7 +56,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>LoggingFileBeatsVM</projectName>
- <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+ <projectFullName>Deploy/dev/KnowledgePlatform/LoggingFileBeatsVM</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>LoggingFileBeatsVM</projectName>
- <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+ <projectFullName>Deploy/dev/KnowledgePlatform/LoggingFileBeatsVM</projectFullName>
<choiceType>PT_MULTI_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
@@ -124,7 +124,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>LoggingFileBeatsVM</projectName>
- <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+ <projectFullName>Deploy/dev/KnowledgePlatform/LoggingFileBeatsVM</projectFullName>
<choiceType>PT_SINGLE_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
@@ -172,4 +172,4 @@ return """<b>This parameter is not used</b>"""</script>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index 672697c8a6a4da486797f8d5ab366b4fc2b3ab11..00b7bf6a7deb50cb6a30f44a596b33e95c9263e9 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -31,51 +32,51 @@
<defaultValue>ArtifactUpload/dev/KnowledgePlatform/Neo4j</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-13436883643465</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.66">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Neo4j</projectName>
<projectFullName>Deploy/dev/KnowledgePlatform/Neo4j</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>PT_SINGLE_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>build_number</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-13436885688258</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
{
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
@@ -86,23 +87,23 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>artifact_version</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-13436888536349</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else {
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
@@ -113,77 +114,76 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Neo4j</projectName>
<projectFullName>Deploy/dev/KnowledgePlatform/Neo4j</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
+ <secureScript plugin="script-security@1.66">
+ <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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Neo4j</projectName>
<projectFullName>Deploy/dev/KnowledgePlatform/Neo4j</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -201,7 +201,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml
index 85bb8d7f511bf9746450b31d5ee4c1c8c274d958..6bd706bb93c2e7619d536e0cfdaf0e9d32507598 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-188174424977419</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -39,7 +39,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -51,13 +51,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-188174429374717</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
@@ -66,7 +66,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -80,7 +80,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -94,8 +94,8 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -104,7 +104,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml
index 186b913653cfb2bcca5ecda1cfaadefe8898db59..e4cea420b730851bd385332f7bc92aaa010516a3 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml
@@ -227,7 +227,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
index 67cabd05f8d0a9d51718bdc17ccc93feab6c21e6..bf385df218c3b6104d53631ab40a8d067527a62b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
@@ -203,7 +203,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.9.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/SyncQRCode/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/SyncQRCode/config.xml
index bda4633dee9c8803ca91b35148e8f88fd23c67be..cc33506862741e7b6efd3a5d6e25c9047bed12b4 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/SyncQRCode/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/SyncQRCode/config.xml
@@ -104,7 +104,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.3.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index b6d9320d4326de58f0048a249ce77309663233d8..a64cf2d1bbcd519ebc453c9836bc2b9912ce53e8 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -31,21 +31,21 @@
<defaultValue>ArtifactUpload/dev/KnowledgePlatform/Yarn</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-2874232768088857</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>return[
'JenkinsJob',
'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -58,13 +58,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>build_number</name>
<description/>
<randomName>choice-parameter-2874449088885218</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -74,7 +74,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -86,13 +86,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>artifact_version</name>
<description/>
<randomName>choice-parameter-2877900313772031</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -101,7 +101,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -113,13 +113,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -127,7 +127,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -139,13 +139,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
@@ -154,7 +154,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -168,7 +168,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -193,8 +193,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -203,7 +203,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/config.xml
index 4506aeec7c17782fec69bbb6c69c7b683b2dea53..228d20b4d3b77a93bb4306d341ec4b5eef750b41 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/config.xml
@@ -1,13 +1,13 @@
<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.15">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+ <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.25">
<dockerLabel></dockerLabel>
<registry plugin="docker-commons@1.16"/>
</org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
- <org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty plugin="config-file-provider@3.6.3">
+ <org.jenkinsci.plugins.configfiles.folder.FolderConfigFileProperty plugin="config-file-provider@3.7.0">
<configs class="sorted-set">
<comparator class="org.jenkinsci.plugins.configfiles.ConfigByIdComparator"/>
</configs>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManager/config.xml
index fe91de3687de7cafa1e6d54bff1adea150e6f49a..27d023b17fb4e222d80dc43da7d285d208dc3594 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/APIManager/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/AdminUtils/config.xml
index ebaedb2e34e99de954a91f2580c4b2274067976f..bcc027f7dff9b0fe8aed77b4986850e8c0380259 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/AdminUtils/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/AdminUtils/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Analytics/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Analytics/config.xml
index 48270103c3807f4bcf5c968becc0e908efff779d..1f171d108b458a4eb6f7983c5d8fa4823fd1e2fa 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Analytics/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Analytics/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Assessment/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Assessment/config.xml
index f0ecf32f7d3459d0e2df7a805ce7c2e8eb72c992..3005e614673f1d756fe256c92604a4b05e599b73 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Assessment/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Assessment/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapCluster/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapCluster/config.xml
index df5bc0fe50626e6abd856f4291a09c14db9db85f..cd562225f78a6a9e3bd226466c6d3ec82425f898 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapCluster/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapCluster/config.xml
@@ -104,7 +104,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.8.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMinimal/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMinimal/config.xml
index 86084333e417021fe9ef416f1d2dc2a3eeaa51df..a0fcdd789c0217887ebffadef76115b0acce342b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMinimal/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMinimal/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.40">
+<flow-definition plugin="workflow-job@2.36">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,12 +20,82 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <autoRebuild>false</autoRebuild>
+ <rebuildDisabled>false</rebuildDisabled>
+ </com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-2544395024638227</randomName>
+ <visibleItemCount>1</visibleItemCount>
+ <script class="org.biouno.unochoice.model.GroovyScript">
+ <secureScript plugin="script-security@1.66">
+ <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>"""
+}
+else
+return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureScript>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureFallbackScript>
+ </script>
+ <projectName>BootstrapMinimal</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/BootstrapMinimal</projectFullName>
+ <parameters class="linked-hash-map"/>
+ <referencedParameters></referencedParameters>
+ <choiceType>ET_FORMATTED_HTML</choiceType>
+ <omitValueField>true</omitValueField>
+ </org.biouno.unochoice.DynamicReferenceParameter>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+ <name>branch_or_tag</name>
+ <description></description>
+ <randomName>choice-parameter-2620434998790477</randomName>
+ <visibleItemCount>1</visibleItemCount>
+ <script class="org.biouno.unochoice.model.GroovyScript">
+ <secureScript plugin="script-security@1.66">
+ <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>""";
+
+}
+else
+return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureScript>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureFallbackScript>
+ </script>
+ <projectName>BootstrapMinimal</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/BootstrapMinimal</projectFullName>
+ <parameters class="linked-hash-map"/>
+ <referencedParameters></referencedParameters>
+ <choiceType>ET_FORMATTED_HTML</choiceType>
+ <omitValueField>true</omitValueField>
+ </org.biouno.unochoice.DynamicReferenceParameter>
+ </parameterDefinitions>
+ </hudson.model.ParametersDefinitionProperty>
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+ <maxConcurrentPerNode>0</maxConcurrentPerNode>
+ <maxConcurrentTotal>0</maxConcurrentTotal>
+ <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+ <throttleEnabled>false</throttleEnabled>
+ <throttleOption>project</throttleOption>
+ <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+ <paramsToUseForLimit></paramsToUseForLimit>
+ </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -34,7 +104,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/BootstrapMongodb/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMongodb/config.xml
similarity index 97%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/BootstrapMongodb/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMongodb/config.xml
index c37ca3a3fc7c08c8d01610497905534632f501d0..ca084b7560e2d16dec412a8d36282c50209561fc 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/BootstrapMongodb/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/BootstrapMongodb/config.xml
@@ -38,7 +38,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>BootstrapMongodb</projectName>
- <projectFullName>Provision/dev/Core/BootstrapMongodb</projectFullName>
+ <projectFullName>Deploy/dev/Core/BootstrapMongodb</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -65,7 +65,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>BootstrapMongodb</projectName>
- <projectFullName>Provision/dev/Core/BootstrapMongodb</projectFullName>
+ <projectFullName>Deploy/dev/Core/BootstrapMongodb</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -91,7 +91,7 @@ return """<b>This parameter is not used</b>"""</script>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit/>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
+
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
<scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
@@ -123,4 +123,4 @@ return """<b>This parameter is not used</b>"""</script>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Bot/config.xml
similarity index 89%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Bot/config.xml
index bf725fd9e615793ad1ec1dda98c98e6a86b470b7..8e3a2f9276114f6fa7bddc3f9f198423932537ed 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Bot/config.xml
@@ -28,7 +28,7 @@
<hudson.model.StringParameterDefinition>
<name>absolute_job_path</name>
<description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/APIManager</defaultValue>
+ <defaultValue>ArtifactUpload/dev/Core/Bot</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
@@ -56,8 +56,8 @@ return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>APIManager</projectName>
- <projectFullName>Deploy/dev/Core/APIManager</projectFullName>
+ <projectName>Bot</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/Bot</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -83,13 +83,22 @@ return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>APIManager</projectName>
- <projectFullName>Deploy/dev/Core/APIManager</projectFullName>
+ <projectName>Bot</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/Bot</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
+ <hudson.model.ChoiceParameterDefinition>
+ <name>role_name</name>
+ <description/>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>chatbot</string>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
@@ -106,7 +115,7 @@ return """<b>This parameter is not used</b>"""</script>
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec/>
- <upstreamProjects>ArtifactUpload/dev/Core/APIManager</upstreamProjects>
+ <upstreamProjects>ArtifactUpload/dev/Core/Bot</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -122,7 +131,7 @@ return """<b>This parameter is not used</b>"""</script>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+ <url>https://github.com/project-sunbird/sunbird-bot.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
@@ -142,7 +151,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
</scm>
- <scriptPath>pipelines/deploy/api-manager/Jenkinsfile</scriptPath>
+ <scriptPath>pipelines/chatbot.Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cassandra/config.xml
index 8445a39d0e4f682696a92625bb86bcc59e085cae..3f4cb870851d30b8aac716fff07835472e302e2a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cassandra/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
<description/>
<keepDependencies>false</keepDependencies>
@@ -24,21 +24,21 @@
<defaultValue>ArtifactUpload/dev/Core/Cassandra</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-9600649228560</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>return[
'JenkinsJob',
'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -51,13 +51,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>build_number</name>
<description/>
<randomName>choice-parameter-9600651313765</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -79,13 +79,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>artifact_version</name>
<description/>
<randomName>choice-parameter-9600653373369</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -94,7 +94,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -106,13 +106,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -120,7 +120,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -132,13 +132,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -147,7 +147,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -161,7 +161,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -186,8 +186,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -196,7 +196,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.3.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDBUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDBUpdate/config.xml
index cacaa806fcff41567a01dbd2287ab392769c7e2d..6d70cff16537b73b3915176b51782c24b78930c5 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDBUpdate/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CassandraDBUpdate/config.xml
@@ -106,7 +106,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.3.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cert/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cert/config.xml
index e2fa6869fb257d2bb4e760838fc7fb0e0fe29e99..84457796bd7780ff337b73b0260b126d89b71c35 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cert/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Cert/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CertRegistry/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CertRegistry/config.xml
index d88da2db635a2e9626a23977f006b08fc485a52f..642ffe75130bb5b5007560bda7d57794f15c42ba 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CertRegistry/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/CertRegistry/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Content/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Content/config.xml
index 8aa755cdc5a7ede44c03f2ac6de57c896f33699f..778e89432517fd2b66825dd9cf1d0103bb89b579 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Content/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Dial/config.xml
similarity index 83%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Dial/config.xml
index 6b5fd45cb7fdd1d75a741fa6925703af9f39e736..e635df4c1e72a1a237eadb9a0c2851933604672d 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Dial/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -28,7 +28,7 @@
<hudson.model.StringParameterDefinition>
<name>absolute_job_path</name>
<description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>Deploy/dev/Core/PlayerCDN</defaultValue>
+ <defaultValue>ArtifactUpload/dev/Core/Dial</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,25 +51,25 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>Player</projectName>
- <projectFullName>Deploy/dev/Core/Player</projectFullName>
+ <projectName>Dial</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/Dial</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,21 +78,30 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>Player</projectName>
- <projectFullName>Deploy/dev/Core/Player</projectFullName>
+ <projectName>Dial</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/Dial</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
+ <hudson.model.ChoiceParameterDefinition>
+ <name>role_name</name>
+ <description/>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>sunbird-deploy</string>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -106,7 +115,7 @@ return """<b>This parameter is not used</b>"""</script>
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec/>
- <upstreamProjects>Deploy/dev/Core/PlayerCDN</upstreamProjects>
+ <upstreamProjects>ArtifactUpload/dev/Core/Dial</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -117,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -137,12 +146,12 @@ return """<b>This parameter is not used</b>"""</script>
<shallow>true</shallow>
<noTags>false</noTags>
<reference/>
- <depth>1</depth>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
</scm>
- <scriptPath>pipelines/deploy/player/Jenkinsfile</scriptPath>
+ <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/DiscussionsMW/config.xml
similarity index 82%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/DiscussionsMW/config.xml
index 406390f30375a99ce3e7155ba831b4b8d6034d90..d9066b159cc66c81236d5839a59d828746c5f738 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/DiscussionsMW/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -28,7 +28,7 @@
<hudson.model.StringParameterDefinition>
<name>absolute_job_path</name>
<description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Learner</defaultValue>
+ <defaultValue>ArtifactUpload/dev/Core/DiscussionsMW</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.76">
<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>"""
}
@@ -51,25 +51,25 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.76">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>Learner</projectName>
- <projectFullName>Deploy/dev/Core/Learner</projectFullName>
+ <projectName>DiscussionsMW</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/DiscussionsMW</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.76">
<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>""";
@@ -78,21 +78,30 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.76">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>Learner</projectName>
- <projectFullName>Deploy/dev/Core/Learner</projectFullName>
+ <projectName>DiscussionsMW</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/DiscussionsMW</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
+ <hudson.model.ChoiceParameterDefinition>
+ <name>role_name</name>
+ <description/>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>sunbird-deploy</string>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -106,7 +115,7 @@ return """<b>This parameter is not used</b>"""</script>
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec/>
- <upstreamProjects>ArtifactUpload/dev/Core/Learner</upstreamProjects>
+ <upstreamProjects>ArtifactUpload/dev/Core/DiscussionsMW</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -117,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -127,7 +136,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.2.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -137,12 +146,12 @@ return """<b>This parameter is not used</b>"""</script>
<shallow>true</shallow>
<noTags>false</noTags>
<reference/>
- <depth>1</depth>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
</scm>
- <scriptPath>pipelines/deploy/learner/Jenkinsfile</scriptPath>
+ <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Enc/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Enc/config.xml
index 7c79c007c157fe62ada40957a9d1d824f66f7145..a70c0171a7a690f6f53e78e91392ea9cd6fc5c7a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Enc/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Enc/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml
deleted file mode 100644
index 3db5484d42bde18a82a9ba9a487f20e0fc09d26c..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/FuntionalTestCases/config.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
- <actions>
- <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobAction plugin="pipeline-model-definition@1.6.0"/>
- <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction plugin="pipeline-model-definition@1.6.0">
- <jobProperties/>
- <triggers/>
- <parameters/>
- <options/>
- </org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction>
- </actions>
- <description/>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <hudson.triggers.TimerTrigger>
- <spec>H 23 * * *</spec>
- </hudson.triggers.TimerTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <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>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>release-2.10.0</name>
- </hudson.plugins.git.BranchSpec>
- <hudson.plugins.git.BranchSpec>
- <name>release-3.0.0</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions/>
- </scm>
- <scriptPath>Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml
index 619cd6c3456241a6801262251b63b6db8a23c9a7..7d53ae637714617f1b6b6803ef08b107f260d1e0 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Groups/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.76">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.76">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.76">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.76">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -136,7 +136,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Hawkeye-superset/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Hawkeye-superset/config.xml
index e9028d14c392a99cd2dddc12816344a01f96681d..7e4d190785dee50987fc308e0cc7c69b903ee196 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Hawkeye-superset/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Hawkeye-superset/config.xml
@@ -136,7 +136,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.3.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KafkaSetup/config.xml
similarity index 84%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KafkaSetup/config.xml
index 6bbe79142af8d2343f0e60c62d5d31b3b97750ec..a1bcf83085bd040130137c15fa9b8c2a055649cf 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Oauth/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KafkaSetup/config.xml
@@ -1,6 +1,13 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.33">
- <actions/>
+<flow-definition plugin="workflow-job@2.34">
+ <actions>
+ <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>
<keepDependencies>false</keepDependencies>
<properties>
@@ -22,7 +29,7 @@
<org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>private_branch</name>
<description></description>
- <randomName>choice-parameter-186759255678992</randomName>
+ <randomName>choice-parameter-188157054642539</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
<secureScript plugin="script-security@1.62">
@@ -38,7 +45,7 @@ return """<b>This parameter is not used</b>"&quo
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>Oauth</projectName>
+ <projectName>KafkaSetup</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -47,12 +54,12 @@ return """<b>This parameter is not used</b>"&quo
<org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>branch_or_tag</name>
<description></description>
- <randomName>choice-parameter-186759262347032</randomName>
+ <randomName>choice-parameter-188157057910170</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
<secureScript plugin="script-security@1.62">
<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>""";
+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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
}
else
@@ -64,22 +71,12 @@ return """<b>This parameter is not used</b>"&quo
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>Oauth</projectName>
+ <projectName>KafkaSetup</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
+ <choiceType>ET_UNORDERED_LIST</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <hudson.model.ChoiceParameterDefinition>
- <name>tag</name>
- <description></description>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>stack-oauth</string>
- <string>stack-kibana</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
@@ -93,7 +90,7 @@ return """<b>This parameter is not used</b>"&quo
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.73">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.11.0">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -117,7 +114,7 @@ return """<b>This parameter is not used</b>"&quo
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
</scm>
- <scriptPath>pipelines/deploy/oauth/Jenkinsfile</scriptPath>
+ <scriptPath>pipelines/deploy/kafka/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Keycloak/config.xml
index 530f56dfc8b0c9e8443557232584af56a9aa592e..0aeb9e696d4909b2a7d63af0aa22cbc3770f9935 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Keycloak/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
<description/>
<keepDependencies>false</keepDependencies>
@@ -24,21 +24,21 @@
<defaultValue>ArtifactUpload/dev/Core/Keycloak</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-9600649228560</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>return[
'JenkinsJob',
'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -51,13 +51,13 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>build_number</name>
<description/>
<randomName>choice-parameter-9600651313765</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -79,13 +79,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>artifact_version</name>
<description/>
<randomName>choice-parameter-9600653373369</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -94,7 +94,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -106,13 +106,13 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -120,7 +120,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -132,13 +132,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -147,7 +147,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -162,12 +162,12 @@ return """<b>This parameter is not used</b>"""</script>
<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>release-1.15_RC9</defaultValue>
+ <defaultValue>release-3.6.0</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -181,8 +181,8 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -191,7 +191,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>keycloak-3.2.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml
index f34b4e9742044d8562ab8745241105c2207adf74..a32fbf199bbc36df66a330d394424acc8e62b653 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakMigration/config.xml
@@ -1,7 +1,6 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
- <description></description>
+ <description/>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -25,51 +24,51 @@
<defaultValue>ArtifactUpload/dev/Core/Keycloak</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-9600649228560</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
+ <secureScript plugin="script-security@1.76">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script></script>
+ <secureFallbackScript plugin="script-security@1.76">
+ <script/>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>KeycloakMigration</projectName>
<projectFullName>Deploy/dev/Kubernetes/KeycloakMigration</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
+ <referencedParameters/>
<choiceType>PT_SINGLE_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>build_number</name>
- <description></description>
+ <description/>
<randomName>choice-parameter-9600651313765</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
+ <secureScript plugin="script-security@1.76">
+ <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>"""
}
else
{
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script></script>
+ <secureFallbackScript plugin="script-security@1.76">
+ <script/>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
@@ -80,23 +79,23 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>artifact_version</name>
- <description></description>
+ <description/>
<randomName>choice-parameter-9600653373369</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
+ <secureScript plugin="script-security@1.76">
+ <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>"""
}
else {
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script></script>
+ <secureFallbackScript plugin="script-security@1.76">
+ <script/>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
@@ -107,49 +106,50 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
- <description></description>
+ <description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
+ <secureScript plugin="script-security@1.76">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.76">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>KeycloakMigration</projectName>
<projectFullName>Deploy/dev/Kubernetes/KeycloakMigration</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
+ <referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
<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/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -158,7 +158,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.5.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakRealm/config.xml
similarity index 86%
rename from deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakRealm/config.xml
index e48455cea15f225576a188b2d3c38540d4e6ee22..0674ca952612e2f2f3808d3fc723c1a78d3b944a 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/user-keycloak/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KeycloakRealm/config.xml
@@ -1,6 +1,13 @@
<?xml version='1.1' encoding='UTF-8'?>
<flow-definition plugin="workflow-job@2.32">
- <actions/>
+ <actions>
+ <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>
<keepDependencies>false</keepDependencies>
<properties>
@@ -22,7 +29,7 @@
<org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>private_branch</name>
<description></description>
- <randomName>choice-parameter-196487835595646</randomName>
+ <randomName>choice-parameter-186662917593857</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
<secureScript plugin="script-security@1.58">
@@ -38,7 +45,7 @@ return """<b>This parameter is not used</b>"&quo
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>user-keycloak</projectName>
+ <projectName>KeycloakRealm</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -47,7 +54,7 @@ return """<b>This parameter is not used</b>"&quo
<org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>branch_or_tag</name>
<description></description>
- <randomName>choice-parameter-196487838166797</randomName>
+ <randomName>choice-parameter-186662921061407</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
<secureScript plugin="script-security@1.58">
@@ -64,7 +71,7 @@ return """<b>This parameter is not used</b>"&quo
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>user-keycloak</projectName>
+ <projectName>KeycloakRealm</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -81,6 +88,9 @@ return """<b>This parameter is not used</b>"&quo
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+ <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+ <triggers/>
+ </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
@@ -107,7 +117,7 @@ return """<b>This parameter is not used</b>"&quo
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
</scm>
- <scriptPath>pipelines/provision/keycloak/Jenkinsfile.user</scriptPath>
+ <scriptPath>pipelines/deploy/keycloak-realm/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KnowledgeMW/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KnowledgeMW/config.xml
index 89018080dc1852865f2e3a4cdc4bda2d2d1caa29..413dc7c22636dff28b5187f67cbe66e435102ca0 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KnowledgeMW/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KnowledgeMW/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -136,7 +136,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KongJWTAdminUtil/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KongJWTAdminUtil/config.xml
index 54d1fa46bf82d7b3fe3dff9924a06f44572efd08..fb34338fb52738afbd788ae9d7d6b08821e65f33 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KongJWTAdminUtil/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/KongJWTAdminUtil/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -39,7 +39,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -51,13 +51,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -66,7 +66,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -89,7 +89,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -103,8 +103,8 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +113,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Learner/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Learner/config.xml
index a79a0679abcb8b9823c41bbe4ecef65f8dfc5ae8..bde05ee653a59c76a5277d24c6c381779c935a58 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Learner/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Learner/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -136,7 +136,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Lms/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Lms/config.xml
index 306f28c71e1d7fe5d97d799919b2462512a7770e..403aaa17b98a670f6a8e0f6e3005f1280456ddc0 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Lms/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Lms/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -136,7 +136,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Logging/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Logging/config.xml
index 3d57b5f3961ae5f967e1f55e082410b27b9a8bf3..2f2ac431a19c1489f8f9be0f802a714c6b82817b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Logging/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Logging/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -39,7 +39,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -51,13 +51,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -66,7 +66,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -103,7 +103,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -117,8 +117,8 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -127,7 +127,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.3.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggingFileBeatsVM/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/LoggingFileBeatsVM/config.xml
similarity index 95%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggingFileBeatsVM/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/LoggingFileBeatsVM/config.xml
index 6d70dacf019259866eb98c61c3702f8d33e3c8cc..044745f2f1d09c975b9a2ccca3825371d7e27f11 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggingFileBeatsVM/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/LoggingFileBeatsVM/config.xml
@@ -29,7 +29,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>LoggingFileBeatsVM</projectName>
- <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+ <projectFullName>Deploy/dev/Kubernetes/LoggingFileBeatsVM</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -56,7 +56,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>LoggingFileBeatsVM</projectName>
- <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+ <projectFullName>Deploy/dev/Kubernetes/LoggingFileBeatsVM</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>LoggingFileBeatsVM</projectName>
- <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+ <projectFullName>Deploy/dev/Kubernetes/LoggingFileBeatsVM</projectFullName>
<choiceType>PT_MULTI_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
@@ -124,7 +124,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>LoggingFileBeatsVM</projectName>
- <projectFullName>Deploy/staging/Kubernetes/LoggingFileBeatsVM</projectFullName>
+ <projectFullName>Deploy/dev/Kubernetes/LoggingFileBeatsVM</projectFullName>
<choiceType>PT_SINGLE_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
@@ -172,4 +172,4 @@ return """<b>This parameter is not used</b>"""</script>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Monitoring/config.xml
index 275efa8201de08da2e2df6aeff803732ff1dc401..e5f6fc441d3dace0ef472a5a3b3f574d249cfa31 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Monitoring/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Monitoring/config.xml
@@ -80,7 +80,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.DynamicReferenceParameter>
<hudson.model.StringParameterDefinition>
<name>tag</name>
- <description/>
+ <description>Please use "dashboards" as tag if you want to install/update the grafana dashboards.</description>
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -100,8 +100,8 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -110,7 +110,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.5.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NetworkConfig/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NetworkConfig/config.xml
index be00b7b2d6df793d75af394d2d3136fe636ba5dc..90cdf960ae03995e8542655ab55410f4a587cf73 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NetworkConfig/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NetworkConfig/config.xml
@@ -110,7 +110,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>internal-lb-fix</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Nodebb/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Nodebb/config.xml
index 752aac1666ec506c86742033e0c96688f5ba184d..55d1ee45d30d3aefc6a0257c64720c585ce97f2c 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Nodebb/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Nodebb/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -136,7 +136,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NodebbUI/config.xml
similarity index 76%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NodebbUI/config.xml
index 20b153b789864dfb45739463ee5982e6c28c5cea..e5438741bf15460e55639c5523aa1071826fad93 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OfflineInstaller/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/NodebbUI/config.xml
@@ -3,20 +3,7 @@
<description/>
<keepDependencies>false</keepDependencies>
<properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-1</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>5</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <hudson.plugins.copyartifact.CopyArtifactPermissionProperty plugin="copyartifact@1.43.1">
- <projectNameList>
- <string>ArtifactUpload/dev/Core/OfflineInstaller</string>
- </projectNameList>
- </hudson.plugins.copyartifact.CopyArtifactPermissionProperty>
<com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
@@ -26,78 +13,14 @@
<hudson.model.StringParameterDefinition>
<name>absolute_job_path</name>
<description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/OfflineInstaller</defaultValue>
+ <defaultValue>ArtifactUpload/dev/Core/NodebbUI</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
- <name>private_branch</name>
- <description/>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.75">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.75">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>offlineInstaller</projectName>
- <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
- <name>branch_or_tag</name>
- <description/>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.75">
- <script>if (override_public_branch.equals("true")) {
-return """<input name="value" value="release-3.5.0" 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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.75">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>offlineInstaller</projectName>
- <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters/>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <hudson.model.ChoiceParameterDefinition>
- <name>offline_installer_type</name>
- <description><font color=dimgray size=2><b>Choose the type of installer you wanted to build</b></font></description>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>windows64bit</string>
- <string>linux64bit</string>
- <string>windows32bit</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
- <randomName>choice-parameter-1754928650096303</randomName>
+ <randomName>choice-parameter-620062284617427</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
<secureScript plugin="script-security@1.75">
@@ -112,8 +35,8 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>offlineInstaller</projectName>
- <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
+ <projectName>NodebbUI</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/NodebbUI</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>PT_SINGLE_SELECT</choiceType>
@@ -123,7 +46,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>build_number</name>
<description/>
- <randomName>choice-parameter-1754928651800681</randomName>
+ <randomName>choice-parameter-620062286335119</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
<secureScript plugin="script-security@1.75">
@@ -141,8 +64,8 @@ return "<b>Not Applicable</b>"
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>offlineInstaller</projectName>
- <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
+ <projectName>NodebbUI</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/NodebbUI</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters>artifact_source</referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -151,7 +74,7 @@ return "<b>Not Applicable</b>"
<org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>artifact_version</name>
<description/>
- <randomName>choice-parameter-1754928653885653</randomName>
+ <randomName>choice-parameter-620062288387509</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
<secureScript plugin="script-security@1.75">
@@ -168,13 +91,65 @@ return "<b>Not Applicable</b>"
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>offlineInstaller</projectName>
- <projectFullName>Deploy/dev/Core/offlineInstaller</projectFullName>
+ <projectName>NodebbUI</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/NodebbUI</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters>artifact_source</referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+ <name>private_branch</name>
+ <description/>
+ <randomName>choice-parameter-2544395024638227</randomName>
+ <visibleItemCount>1</visibleItemCount>
+ <script class="org.biouno.unochoice.model.GroovyScript">
+ <secureScript plugin="script-security@1.75">
+ <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>"""
+}
+else
+return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureScript>
+ <secureFallbackScript plugin="script-security@1.75">
+ <script>return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureFallbackScript>
+ </script>
+ <projectName>NodebbUI</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/NodebbUI</projectFullName>
+ <parameters class="linked-hash-map"/>
+ <referencedParameters/>
+ <choiceType>ET_FORMATTED_HTML</choiceType>
+ <omitValueField>true</omitValueField>
+ </org.biouno.unochoice.DynamicReferenceParameter>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
+ <name>branch_or_tag</name>
+ <description/>
+ <randomName>choice-parameter-2620434998790477</randomName>
+ <visibleItemCount>1</visibleItemCount>
+ <script class="org.biouno.unochoice.model.GroovyScript">
+ <secureScript plugin="script-security@1.75">
+ <script>if (override_public_branch.equals("true")) {
+return """<input name="value" value="${public_repo_branch}" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Change this value to checkout Jenkinsfile from a different tag or branch.<br>Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.</b></font></b></font>""";
+}
+else
+return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureScript>
+ <secureFallbackScript plugin="script-security@1.75">
+ <script>return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureFallbackScript>
+ </script>
+ <projectName>NodebbUI</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/NodebbUI</projectFullName>
+ <parameters class="linked-hash-map"/>
+ <referencedParameters/>
+ <choiceType>ET_FORMATTED_HTML</choiceType>
+ <omitValueField>true</omitValueField>
+ </org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
@@ -191,7 +166,7 @@ return "<b>Not Applicable</b>"
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec/>
- <upstreamProjects>ArtifactUpload/dev/Core/OfflineInstaller</upstreamProjects>
+ <upstreamProjects>/ArtifactUpload/dev/Core/NodebbUI</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -222,14 +197,14 @@ return "<b>Not Applicable</b>"
<shallow>true</shallow>
<noTags>false</noTags>
<reference/>
- <depth>1</depth>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
</scm>
- <scriptPath>pipelines/offlineinstaller/Jenkinsfile</scriptPath>
+ <scriptPath>pipelines/deploy/NodebbUI/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Notification/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Notification/config.xml
index f1aec9208ab882c53ba56e9f7ea87fe0f3cae7c0..5045f55c734667eb4283e11ae77ee6bce1e5ff00 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Notification/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Notification/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardAPIs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardAPIs/config.xml
index a6ec25b005925ab18cf0862ac4863fccd801d8a8..31b2af4eb599264f81be9495a7f9b810fdfc2abe 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardAPIs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardAPIs/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -39,7 +39,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -51,13 +51,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -66,7 +66,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -89,7 +89,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -103,8 +103,8 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +113,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardConsumers/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardConsumers/config.xml
index 10044249b5b4dc324e9c618d2fbbbd24ea9bbea4..480e616edf56e27f34bad858f251540929400a37 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardConsumers/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/OnboardConsumers/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
<description/>
<keepDependencies>false</keepDependencies>
@@ -18,13 +18,13 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-186788940114941</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -32,7 +32,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -44,13 +44,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-186788943531283</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -59,7 +59,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -73,7 +73,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -84,8 +84,8 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml
index a28bc0763c8cabe9466c87434b8f3761bd859f98..541b1d523efbfa7a227d75cc4d7c304f6d15cbe5 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Player/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>true</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.76">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.76">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.76">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.76">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.1">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.2">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -136,7 +136,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Print/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Print/config.xml
index a79315647fa4f3f1bf016aca1a40461dc017d3e8..c3a78cb096652edd47b107d02ea17328a3054150 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Print/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Print/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -34,65 +35,65 @@
<hudson.model.StringParameterDefinition>
<name>image_tag</name>
<description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue/>
+ <defaultValue></defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Print</projectName>
<projectFullName>Deploy/dev/Kubernetes/Print</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>""";
+ <secureScript plugin="script-security@1.66">
+ <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>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Print</projectName>
<projectFullName>Deploy/dev/Kubernetes/Print</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
<hudson.model.ChoiceParameterDefinition>
<name>role_name</name>
- <description/>
+ <description></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>sunbird-deploy</string>
@@ -101,20 +102,19 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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></spec>
<upstreamProjects>ArtifactUpload/dev/Core/Print</upstreamProjects>
<threshold>
<name>SUCCESS</name>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -145,7 +145,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Report/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Report/config.xml
index 47bf1e8ee48e9f19916e2d351901e71a9c739806..afea80b25b931a93f747e168b6b6b1cd15c19a07 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Report/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Report/config.xml
@@ -136,7 +136,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.3.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Router/config.xml
similarity index 90%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Router/config.xml
index 5a49dbdceb094ba3a2f89d3ba4c814477e9fef82..dc8c2dee9ada3b0db2c57ad1b9d1e27fbbaacf4c 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Badger/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Router/config.xml
@@ -28,7 +28,7 @@
<hudson.model.StringParameterDefinition>
<name>absolute_job_path</name>
<description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/Badger</defaultValue>
+ <defaultValue>ArtifactUpload/dev/Core/Router</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
@@ -56,8 +56,8 @@ return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>Badger</projectName>
- <projectFullName>Deploy/dev/Kubernetes/Badger</projectFullName>
+ <projectName>Router</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/Router</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -83,19 +83,22 @@ return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>Badger</projectName>
- <projectFullName>Deploy/dev/Kubernetes/Badger</projectFullName>
+ <projectName>Router</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/Router</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <hudson.model.StringParameterDefinition>
+ <hudson.model.ChoiceParameterDefinition>
<name>role_name</name>
<description/>
- <defaultValue>deploy-badger</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>chatbot</string>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
@@ -112,7 +115,7 @@ return """<b>This parameter is not used</b>"""</script>
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec/>
- <upstreamProjects>ArtifactUpload/dev/Core/Badger</upstreamProjects>
+ <upstreamProjects>ArtifactUpload/dev/Core/Router</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -128,7 +131,7 @@ return """<b>This parameter is not used</b>"""</script>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+ <url>https://github.com/project-sunbird/sunbird-bot.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
@@ -148,7 +151,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
</scm>
- <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
+ <scriptPath>pipelines/chatbot.Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Search/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Search/config.xml
index 0ef53825abf47d6832a7738cb0b16d02a8097d4e..5048019f89cc6c4c0a65111239b0d532ac1a62a2 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Search/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Search/config.xml
@@ -136,7 +136,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Taxonomy/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Taxonomy/config.xml
index ef2a23242a663389df7686b2b969e5272fdf7f6f..9dc6d6e0e4303598c50b972821f2a8208aa0d193 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Taxonomy/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Taxonomy/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -136,7 +136,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Telemetry/config.xml
index ef7c4a9a1ad3bb815dcac1705b295a11f112bbfe..6f6420cf19ad15c63b3592f1fb34cc1e27c83c87 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Telemetry/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Telemetry/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -34,65 +35,65 @@
<hudson.model.StringParameterDefinition>
<name>image_tag</name>
<description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue/>
+ <defaultValue></defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Telemetry</projectName>
<projectFullName>Deploy/dev/Kubernetes/Telemetry</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>""";
+ <secureScript plugin="script-security@1.66">
+ <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>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Telemetry</projectName>
<projectFullName>Deploy/dev/Kubernetes/Telemetry</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
<hudson.model.ChoiceParameterDefinition>
<name>role_name</name>
- <description/>
+ <description></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>sunbird-deploy</string>
@@ -101,20 +102,19 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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></spec>
<upstreamProjects>ArtifactUpload/dev/Core/Telemetry</upstreamProjects>
<threshold>
<name>SUCCESS</name>
@@ -126,8 +126,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -145,7 +145,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadDesktopFaq/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadChatbotConfig/config.xml
similarity index 77%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadDesktopFaq/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadChatbotConfig/config.xml
index 69ec6f2496e0bd89b739c4a034b76651fca978ca..d471f3a547951110740c52448f4bd5acf842250e 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/UploadDesktopFaq/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadChatbotConfig/config.xml
@@ -1,14 +1,21 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
- <actions/>
+ <actions>
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
+ <jobPropertyDescriptors>
+ <string>hudson.model.ParametersDefinitionProperty</string>
+ <string>com.sonyericsson.rebuild.RebuildSettings</string>
+ </jobPropertyDescriptors>
+ </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+ </actions>
<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>2</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -37,8 +44,8 @@ return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>UploadDesktopFaq</projectName>
- <projectFullName>Deploy/dev/Core/UploadDesktopFaq</projectFullName>
+ <projectName>UploadChatbotConfig</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/UploadChatbotConfig</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -64,46 +71,55 @@ return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>UploadDesktopFaq</projectName>
- <projectFullName>Deploy/dev/Core/UploadDesktopFaq</projectFullName>
+ <projectName>UploadChatbotConfig</projectName>
+ <projectFullName>Deploy/dev/Kubernetes/UploadChatbotConfig</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
+ <hudson.model.StringParameterDefinition>
+ <name>bot_repo_branch</name>
+ <description/>
+ <defaultValue>master</defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
- <name>desktop_container</name>
+ <name>container_name</name>
<description/>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
- <string>public</string>
+ <string>chatbot</string>
</a>
</choices>
</hudson.model.ChoiceParameterDefinition>
- <hudson.model.ChoiceParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>source_path</name>
+ <description/>
+ <defaultValue>sunbird-bot/router/config</defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
<name>destination_path</name>
<description/>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>desktopFAQ/faq-en.json</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
+ <defaultValue>chatbot/router/config</defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>tag</name>
<description/>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
- <string>upload-desktop-faq</string>
+ <string>upload-chatbot-config</string>
</a>
</choices>
</hudson.model.ChoiceParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
- <name>src_file_path</name>
+ <name>bot_repo</name>
<description/>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
- <string>utils/DesktopFAQ/faq-en.json</string>
+ <string>https://github.com/project-sunbird/sunbird-bot.git</string>
</a>
</choices>
</hudson.model.ChoiceParameterDefinition>
@@ -123,8 +139,8 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -148,9 +164,9 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
</scm>
- <scriptPath>pipelines/deploy/desktop-faq/Jenkinsfile</scriptPath>
+ <scriptPath>pipelines/upload/chatbot/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadSchema/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadSchema/config.xml
index b2dbba03573786e75b145ef6e93a1b9d491148a8..411597a65804f2eab0f1ee5c4c13c18615fd8e89 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadSchema/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UploadSchema/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -39,7 +39,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -51,13 +51,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -66,7 +66,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -81,12 +81,12 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.model.StringParameterDefinition>
<name>kp_branch_or_tag</name>
<description>This is knowledge platform branch or tag</description>
- <defaultValue>release-3.4.0</defaultValue>
+ <defaultValue>release-3.7.0</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -100,8 +100,8 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -110,7 +110,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UserOrg/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UserOrg/config.xml
deleted file mode 100644
index bb6a462579ca83f1206f93a29b335fe5f6565f07..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/UserOrg/config.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.36">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/UserOrg</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>UserOrg</projectName>
- <projectFullName>Deploy/dev/Kubernetes/UserOrg</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.66">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.66">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>UserOrg</projectName>
- <projectFullName>Deploy/dev/Kubernetes/UserOrg</projectFullName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <hudson.model.ChoiceParameterDefinition>
- <name>role_name</name>
- <description></description>
- <choices class="java.util.Arrays$ArrayList">
- <a class="string-array">
- <string>sunbird-deploy</string>
- </a>
- </choices>
- </hudson.model.ChoiceParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <jenkins.triggers.ReverseBuildTrigger>
- <spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Core/UserOrg</upstreamProjects>
- <threshold>
- <name>SUCCESS</name>
- <ordinal>0</ordinal>
- <color>BLUE</color>
- <completeBuild>true</completeBuild>
- </threshold>
- </jenkins.triggers.ReverseBuildTrigger>
- </triggers>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>kubernetes/pipelines/deploy_core/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Yarn/config.xml
index afb0969da89d1ae465ac42cb73ac321a968bd4fc..3ab56ba4d01b9229bf272464ab9a16b5ff5fdb9b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/Yarn/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -31,185 +32,184 @@
<defaultValue>ArtifactUpload/dev/Core/Yarn</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-9061667106947</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.66">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Yarn</projectName>
- <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+ <projectFullName>Deploy/dev/Core/Yarn</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>PT_SINGLE_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>build_number</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-9061670571657</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
{
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Yarn</projectName>
- <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+ <projectFullName>Deploy/dev/Core/Yarn</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters>artifact_source</referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>artifact_version</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-9061673103864</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else {
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Yarn</projectName>
- <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+ <projectFullName>Deploy/dev/Core/Yarn</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters>artifact_source</referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Yarn</projectName>
- <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+ <projectFullName>Deploy/dev/Core/Yarn</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
+ <secureScript plugin="script-security@1.66">
+ <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Yarn</projectName>
- <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+ <projectFullName>Deploy/dev/Core/Yarn</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
<name>job_names_to_deploy</name>
<description><font color=green size=2><b>Choose the samza app names to deploy and this will kill the selected samza app and deploy them. Multi selection is available.</b></font></description>
<randomName>choice-parameter-8026182213525059</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <script>return ['lms.user-account-merger_1',
-'lms.sso-account-updater_1',
-'lms.indexer_1',
-'lms.notification-job_1']</script>
+ <secureScript plugin="script-security@1.66">
+ <script>return ['lms.user-account-merger_1',
+'lms.sso-account-updater_1',
+'lms.indexer_1',
+'lms.notification-job_1']</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Yarn</projectName>
- <projectFullName>Deploy/dev/Kubernetes/Yarn</projectFullName>
+ <projectFullName>Deploy/dev/Core/Yarn</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>PT_MULTI_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -227,7 +227,7 @@ return """<b>This parameter is not used</b>"""</script>
<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>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-private-ingress/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-private-ingress/config.xml
index 6af233e9f1db03159229d905ecaf130d5935dec1..7d9c7d81b24a08df0a66a12861bed73b717587a8 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-private-ingress/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-private-ingress/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -102,7 +102,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -116,8 +116,8 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.86">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.4.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-public-ingress/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-public-ingress/config.xml
index e24b07952f5d19d0b7595c0ca0a5343e2e4bf86e..22d9def39c035623082a8901fc3f18ee6808d544 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-public-ingress/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Kubernetes/jobs/nginx-public-ingress/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -37,13 +37,13 @@
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -51,7 +51,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -63,13 +63,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -78,7 +78,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -102,7 +102,7 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -116,8 +116,8 @@ return """<b>This parameter is not used</b>"""</script>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -126,7 +126,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.4.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
index 0f30f927eddd4bcb8ebed23063699d709842edb5..5a32c011bcd590b578137c09744d24ae2e9bdf36 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
@@ -187,7 +187,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>editor-chnages</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
index be250dc944e6b58b51cbf047631af18ae7982141..1c65e94d24527812313c4fded1b47b1b36bd71a0 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
@@ -187,7 +187,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>editor-chnages</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
index 04b82ffeb03ea761ea49fc128c4d23624266d3a8..999dde5c352e4f5bba39a66521354ea69e588ff5 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
@@ -1,6 +1,7 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions/>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -16,51 +17,51 @@
<defaultValue>ArtifactUpload/dev/Plugins/ContentPlayer</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-620062284617427</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.66">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>ContentPlayer</projectName>
<projectFullName>Deploy/dev/Plugins/ContentPlayer</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>PT_SINGLE_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>build_number</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-620062286335119</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
{
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
@@ -71,23 +72,23 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>artifact_version</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-620062288387509</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else {
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
@@ -98,74 +99,73 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>ContentPlayer</projectName>
<projectFullName>Deploy/dev/Plugins/ContentPlayer</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <script>if (override_public_branch.equals("true")) {
-return """<input name="value" value="${public_repo_branch}" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Change this value to checkout Jenkinsfile from a different tag or branch.<br>Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.</b></font></b></font>""";
+ <secureScript plugin="script-security@1.66">
+ <script>if (override_public_branch.equals("true")) {
+return """<input name="value" value="${public_repo_branch}" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Change this value to checkout Jenkinsfile from a different tag or branch.<br>Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.</b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>ContentPlayer</projectName>
<projectFullName>Deploy/dev/Plugins/ContentPlayer</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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></spec>
<upstreamProjects>ArtifactUpload/dev/Plugins/ContentPlayer</upstreamProjects>
<threshold>
<name>SUCCESS</name>
@@ -177,8 +177,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -196,7 +196,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
index d3dc97dda4f74e59a065f573e36e4126a8471b43..885232b5bb9edf41ad241c54cd9cc894459e53a2 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
@@ -1,6 +1,7 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions/>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
@@ -16,51 +17,51 @@
<defaultValue>ArtifactUpload/dev/Plugins/ContentPlugins</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.1">
<name>artifact_source</name>
<description><font color=dimgray size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-620062284617427</randomName>
- <visibleItemCount>1</visibleItemCount>
+ <visibleItemCount>2</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.66">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>ContentPlugins</projectName>
<projectFullName>Deploy/dev/Plugins/ContentPlugins</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>PT_SINGLE_SELECT</choiceType>
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>build_number</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-620062286335119</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
{
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
@@ -71,23 +72,23 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>artifact_version</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-620062288387509</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else {
-return "<b>Not Applicable</b>"
+return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script/>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
@@ -98,74 +99,74 @@ return "<b>Not Applicable</b>"
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2544395024638227</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>ContentPlugins</projectName>
<projectFullName>Deploy/dev/Plugins/ContentPlugins</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-2620434998790477</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <script>if (override_public_branch.equals("true")) {
-return """<input name="value" value="${public_repo_branch}" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Change this value to checkout Jenkinsfile from a different tag or branch.<br>Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.</b></font></b></font>""";
+ <secureScript plugin="script-security@1.66">
+ <script>if (override_public_branch.equals("true")) {
+return """<input name="value" value="${public_repo_branch}" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Change this value to checkout Jenkinsfile from a different tag or branch.<br>Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.</b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>ContentPlugins</projectName>
<projectFullName>Deploy/dev/Plugins/ContentPlugins</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
+ <paramsToUseForLimit></paramsToUseForLimit>
+ <configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
- <spec/>
+ <spec></spec>
<upstreamProjects>ArtifactUpload/dev/Plugins/ContentPlugins</upstreamProjects>
<threshold>
<name>SUCCESS</name>
@@ -177,8 +178,8 @@ return """<b>This parameter is not used</b>"""</script>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -196,7 +197,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
index 102495eaab86bf0d1165295dce9926e2964f0ad9..53d4faf5e257d8f984b79c8820397bfcc744662b 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
@@ -187,7 +187,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>editor-chnages</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/org_sunbird_questionunit_quml/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/org_sunbird_questionunit_quml/config.xml
deleted file mode 100644
index 73b41059d4156feec5627551808d89e0002d53d4..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/org_sunbird_questionunit_quml/config.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Plugins/ContentPlugins</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
- <name>artifact_source</name>
- <description><font color=dimgray size=2><b>
-ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
- <randomName>choice-parameter-620062284617427</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.58">
- <script>return[
-'JenkinsJob',
-'ArtifactRepo'
-]</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>org_sunbird_questionunit_quml</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>PT_SINGLE_SELECT</choiceType>
- <filterable>false</filterable>
- <filterLength>1</filterLength>
- </org.biouno.unochoice.CascadeChoiceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>build_number</name>
- <description></description>
- <randomName>choice-parameter-620062286335119</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>"""
-}
-else
-{
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>org_sunbird_questionunit_quml</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>artifact_version</name>
- <description></description>
- <randomName>choice-parameter-620062288387509</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>"""
-}
-else {
-return "<b>Not Applicable</b>"
-}</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script></script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>org_sunbird_questionunit_quml</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters>artifact_source</referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>org_sunbird_questionunit_quml</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.58">
- <script>if (override_public_branch.equals("true")) {
-return """<input name="value" value="${public_repo_branch}" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Change this value to checkout Jenkinsfile from a different tag or branch.<br>Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.</b></font></b></font>""";
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>org_sunbird_questionunit_quml</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <hudson.model.StringParameterDefinition>
- <name>plugin_name</name>
- <description></description>
- <defaultValue>org.sunbird.questionunit.quml-1.0</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <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>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/deploy/org_sunbird_questionunit_quml/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/config.xml b/deploy/jenkins/jobs/OpsAdministration/config.xml
index 92618cba962f72c6132bd317b68ff0d74bfe0605..68477b8ac7421fc78d69182df3125c9ab3412fdf 100644
--- a/deploy/jenkins/jobs/OpsAdministration/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/config.xml
@@ -1,12 +1,12 @@
<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.16"/>
- </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
+ <registry plugin="docker-commons@1.13"/>
+ </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
<views>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml
index fa769962d2e513f60ec302c04459002d7a09cc5e..6ac2482d122f6047b22c325a1bb3e58466a59a2e 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml
@@ -99,7 +99,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml
index af8153a6b8fc4187708404ff120c0df1a8d161cc..5e5da31aced81f0c88387436117c08486774442c 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchRestore/config.xml
@@ -103,7 +103,7 @@ return """<b>This parameter is not used</b>"&quo
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/MasterAlt/sunbird-devops.git</url>
+ <url>https://github.com/project-sunbird/sunbird-devops.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml
index 85c852a1719d309e6278b26db1b0e4008d93dcae..2bbc1edd9b094e15c30d77f44d19a26b8f8075e0 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CassandraBackup/config.xml
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.9.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml
index 30e2a224b9501d60198fa180c3b554181b57576f..7bb601d8095c9619703e865699bbb611cf433daa 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml
@@ -114,12 +114,12 @@ return """<b>This parameter is not used</b>"""</script>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/rjshrjndrn/sunbird-devops.git</url>
+ <url>https://github.com/project-sunbird/sunbird-devops.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>useradd</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
index 5e891cba0ba65af6d8a7a899459251c71428c241..734cc8672070f90aafc4f4e0d14c4037b9ca7528 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
@@ -94,7 +94,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Health/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Health/config.xml
deleted file mode 100644
index 1cd2aa21a67314bb767f9da6eda3be83729020e9..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Health/config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- </properties>
- <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>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions/>
- </scm>
- <scriptPath>pipelines/deploy/health-check/Jenkinsfile</scriptPath>
- <lightweight>true</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/JenkinsBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/JenkinsBackup/config.xml
index c4b34773688582b4ce07d5af930db045d968512c..1c18d217fce88a9de18e7bf8f0a9cd0359f07556 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/JenkinsBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/JenkinsBackup/config.xml
@@ -98,7 +98,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KeyRotation/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KeyRotation/config.xml
deleted file mode 100644
index c87f70872af64c8ede3e1d5b986f705634b59e70..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KeyRotation/config.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>bootstrap_user</name>
- <description><font color="black" size=2><b>Deployer user</b></font></description>
- <defaultValue>deployer</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>bootstrap_user_public_key</name>
- <description><font color="black" size=2><b>Deployer user public key keep in single quotes</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>ssh_user</name>
- <description><font color="black" size=2><b>ops user</b></font></description>
- <defaultValue>ops</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>ssh_private_file</name>
- <description><font color="black" size=2><b>location of ssh key for ops user from '/'</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>ssh_public_key</name>
- <description><font color="black" size=2><b>ops public key</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-189737247413523</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.57">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.57">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KeyRotation</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-189737249857994</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.57">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.57">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KeyRotation</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/bootstrap/Jenkinsfile.rotatekey</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KongMigration/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KongMigration/config.xml
deleted file mode 100644
index 9e18416ad5f66027a14a7b873d19dd8b2c8d5637..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KongMigration/config.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions>
- <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>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/APIManager</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
- <defaultValue></defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-2544395024638227</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KongMigration</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-2620434998790477</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>KongMigration</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers/>
- </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- </properties>
- <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>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/ops/kong-migration/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml
index 3d52d256c1afb698a0dba7744d43900d613826d7..14a8aa218a19eb2f4a5a55d1f454611db94acc2e 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml
@@ -99,7 +99,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ManagedPostgresBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ManagedPostgresBackup/config.xml
index 74888f8ff0895f29f92f3fecbcba15200ef583ff..9a31f8ac49872349694626122b8893206d36b9b9 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ManagedPostgresBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ManagedPostgresBackup/config.xml
@@ -107,7 +107,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.3.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml
index 11c154f9a135883649fb179ff91ed349447f064f..ce628782d213e7e2f22b148d8d58f8d4fdc38c72 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlBackup/config.xml
@@ -99,7 +99,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlRestore/config.xml
index f9a24a2bc3c76e12152319215b1393db60402386..c3f683d6f33d7c79c77ef411b0dbebb4dedaa120 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostgresqlRestore/config.xml
@@ -90,7 +90,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml
index 1d8cb3e0eac2588dbd372bb70ae5f93eb68e88e1..1b235d21711b20778e2bac29687b11ff28e4388d 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusBackup/config.xml
@@ -99,7 +99,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml
index 768fce6ca54e2944cbf6d2e02a8d0eab44913bc1..3dcd500e0dbc202e5a435bdc2025133ff0efe77a 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PrometheusSanpshot/config.xml
@@ -99,7 +99,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backup</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/RedisBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/RedisBackup/config.xml
index 0f5f261ef85dcee81e76c34057ce6760e023957d..0aa7ef1a3e55236ab9c60d8d183542307410eae8 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/RedisBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/RedisBackup/config.xml
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.3.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/SwarmBootstrap/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/SwarmBootstrap/config.xml
deleted file mode 100644
index ef4f2bf6d0a229943f2b9b9e9cae854db67ef9b9..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/SwarmBootstrap/config.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-189723213053334</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.57">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.57">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>SwarmBootstrap</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-189723215007628</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.57">
- <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>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.57">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>SwarmBootstrap</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/bootstrap-swarm/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml
index ddae73cc32fd440a7884d3253a6be166036aa38c..9919684db35101b5099190d616656f3c1b617e24 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraBackup/config.xml
@@ -118,7 +118,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraRestore/config.xml
index fa5bdcbb2f8b5ac1c83c836bcf1ee2fecc28773d..657062c09c7d756d1a40e2ab11404ec4b585dd69 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CassandraRestore/config.xml
@@ -109,7 +109,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml
index 995714507f40c3f9ed57626f6efa89bcc62c317d..0930cf0cc5cc1dcfc5847cc9e14d734aaff880a4 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/DruidPostgresBackup/config.xml
@@ -98,7 +98,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml
index 5ea4ae60f30b35c79635f1e3be64b15fecfddee7..892d24778b87ff670bc6a61a4c85523717ec1436 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml
@@ -112,7 +112,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchRestore/config.xml
index c3d01408706c728c9a1208736542c4e766b5aba2..a5bd7e8d01eb666e44fd0bdd2f891c63aebb0264 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchRestore/config.xml
@@ -111,7 +111,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml
deleted file mode 100644
index 870f36491421360ebb330ed7ed84cd311fe401c3..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Health/config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- </properties>
- <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>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions/>
- </scm>
- <scriptPath>pipelines/deploy/health-check/Jenkinsfile-dp</scriptPath>
- <lightweight>true</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml
index 49635f78e87ce4d0fafefc1b58eb1ffd02c27572..fb37f4fe06bd617bff741f8e4d376d9a43824f1e 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml
@@ -103,12 +103,12 @@ return """<b>This parameter is not used</b>"&quo
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/MasterAlt/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.9.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml
index 9a0942df58c20b6b177f341a0d385e5ca19ddfe6..615c105c474c34ab6b3da3b996e581e2c8090c97 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Influxdb_restore/config.xml
@@ -70,7 +70,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.9.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/MonitDeploy/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/MonitDeploy/config.xml
index 713e2f38d1f465b0451e78c5277ba82b2ff3ad5a..8f1045475e2f2d2fb5b0ed385915eca0416c0444 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/MonitDeploy/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/MonitDeploy/config.xml
@@ -110,12 +110,12 @@ return """<b>This parameter is not used</b>"""</script>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/kaali09/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-3.2.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlBackup/config.xml
index edfc1ee0d5d958f084d5047f4b7fe027f4101475..416d567b2a0de2f735c68aeb6c1350280e73b987 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlBackup/config.xml
@@ -90,7 +90,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlRestore/config.xml
index 1369badc49ad953c5a7d09256a3f703c3fd7aa2f..faeeb5e2e5adb9d1a25f5aafafcbcd9e1d3e4dfa 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlRestore/config.xml
@@ -90,7 +90,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisBackup/config.xml
index 7d3c56036d2d33f8faa4ecc52b4a0ce602f2966b..a0ca8257ef3648bb249bd107658093b27c1df55d 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisBackup/config.xml
@@ -92,12 +92,12 @@ return """<b>This parameter is not used</b>"""</script>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>redis-multiprocess</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisRestore/config.xml
similarity index 96%
rename from deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml
rename to deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisRestore/config.xml
index 4de167aaf401183ebfa99b4743946138319d6ece..abc7a3a0942d914af01c701acc09b92753ab26ff 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/redis-restore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RedisRestore/config.xml
@@ -66,12 +66,12 @@ return """<b>This parameter is not used</b>"""</script>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/sowmya-dixit/sunbird-data-pipeline.git</url>
+ <url>https://github.com/project-sunbird/sunbird-data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>redis-multiprocess</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RestartSecorJobs/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RestartSecorJobs/config.xml
index 002f8f1f87790e6453419f764ae13dd703544170..dc74a32bcdd28d6501498d2940bee40bbd671c95 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RestartSecorJobs/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/RestartSecorJobs/config.xml
@@ -150,7 +150,7 @@ return """<b>This parameter is not used</b>"""</script>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.10.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml
index 6bead98a4c94449e6b1da6702dfa7c34db64a528..5fc3897efcc04c43c4dbb8f8fc632e9982182dab 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsAlert/config.xml
@@ -113,7 +113,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml
index 293f2e6b955333d09ac082ffca3acf9f56a8b40f..e77ed5775b80d44fbb9e97b8241f7484e2e5fd9e 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaJobsKill/config.xml
@@ -123,7 +123,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml
index 20c333f607d4afeb65fdccba7a39c497b18e4bcf..0b79cce07b88558cb01f7982d2697ffe3d83cb33 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Test/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Test/config.xml
deleted file mode 100644
index 08c7fb9e7b5b5d6bb11025295844fc901bf8d642..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Test/config.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><project>
- <actions/>
- <description/>
- <keepDependencies>false</keepDependencies>
- <properties>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.FileParameterDefinition>
- <name>~jenkins</name>
- <description/>
- </hudson.model.FileParameterDefinition>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
- </properties>
- <scm class="hudson.scm.NullSCM"/>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <triggers/>
- <concurrentBuild>false</concurrentBuild>
- <builders/>
- <publishers/>
- <buildWrappers/>
-</project>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml
index a188429354ac3ccdd45a4883990b090951ca45e8..e7d8019a557ae0d9465a7bb041e6875fee6b84c4 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml
@@ -108,12 +108,12 @@ return """<b>This parameter is not used</b>"&quo
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/badaltechiepi/sunbird-learning-platform.git</url>
+ <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>patch-2</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml
index 6f995b76af21c1895bbf667972505e093e979cfa..e051355046c3eb9c0c04012dcda787024f72c1a8 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchBackup/config.xml
@@ -96,12 +96,12 @@ return """<b>This parameter is not used</b>"&quo
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/MasterAlt/sunbird-learning-platform.git</url>
+ <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>es-provision</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml
index 2b968ad93d7413e1a56632ae8ed0ef1666c8d2ca..1439c33ee942bcef90b5fe2afb85c17b01b4ca3f 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml
@@ -103,7 +103,7 @@ return """<b>This parameter is not used</b>"&quo
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/MasterAlt/sunbird-learning-platform.git</url>
+ <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml
deleted file mode 100644
index d5825945e2dbc1ba8dc4e1e4bbce3d09cc7c1f9f..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Health/config.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- </properties>
- <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>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/harshavardhanc/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions/>
- </scm>
- <scriptPath>pipelines/deploy/health-check/Jenkinsfile-lp</scriptPath>
- <lightweight>true</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml
index 63f498537c75f8c22452f9a26628413b186f2a42..df9076d48970fd89c9e7ca71fd47ea9f391d020a 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml
@@ -101,7 +101,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.9.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml
index 9de5c0d6c64aa9387794008371c5a84755db2a92..4e3c21346dccbb1741a1d606768bff8f5cc41a7d 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml
@@ -96,12 +96,12 @@ return """<b>This parameter is not used</b>"&quo
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/MasterAlt/sunbird-learning-platform.git</url>
+ <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>release-2.9.0</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Provision/config.xml b/deploy/jenkins/jobs/Provision/config.xml
index 92618cba962f72c6132bd317b68ff0d74bfe0605..68477b8ac7421fc78d69182df3125c9ab3412fdf 100644
--- a/deploy/jenkins/jobs/Provision/config.xml
+++ b/deploy/jenkins/jobs/Provision/config.xml
@@ -1,12 +1,12 @@
<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.12">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow@1.23">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.16"/>
- </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
+ <registry plugin="docker-commons@1.13"/>
+ </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
<views>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/config.xml
index ca27afff705d0451baa23e45521eebd069a68472..56424f5bf3807e368ba600e923f30b26d08c35ad 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/config.xml
+++ b/deploy/jenkins/jobs/Provision/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.15">
<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.25">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.15"/>
- </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
+ <registry plugin="docker-commons@1.17"/>
+ </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
<views>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
index 7670b1cf703b5a18598e600530612e307898591c..e399fb8fbc53c26d1d7e550c833460681ed6566a 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
@@ -1,6 +1,7 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions/>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -18,74 +19,73 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196486141556745</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Cassandra</projectName>
<projectFullName>Provision/dev/Core/Cassandra</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196486144020383</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>""";
+ <secureScript plugin="script-security@1.66">
+ <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>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Cassandra</projectName>
<projectFullName>Provision/dev/Core/Cassandra</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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>
-
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -103,7 +103,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogES/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogES/config.xml
index 9e219ff211b9f8731c419bcb9e6b99dfd6016a6d..20e8417954a083756c4b6c3c4673c08f9e8f0dfc 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogES/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogES/config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions/>
<description/>
<keepDependencies>false</keepDependencies>
@@ -18,13 +18,13 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-186487879604743</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>if (override_private_branch.equals("true")) {
return """<input name="value" value="db_restore" 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>"""
}
@@ -32,25 +32,25 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>LogEsUpgrade6xx</projectName>
- <projectFullName>Provision/dev/Core/LogEsUpgrade6xx</projectFullName>
+ <projectName>LogES</projectName>
+ <projectFullName>Provision/dev/Core/LogES</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-186487885338467</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>""";
@@ -59,13 +59,13 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>LogEsUpgrade6xx</projectName>
- <projectFullName>Provision/dev/Core/LogEsUpgrade6xx</projectFullName>
+ <projectName>LogES</projectName>
+ <projectFullName>Provision/dev/Core/LogES</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -73,7 +73,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -84,8 +84,8 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/MongodbCluster/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/MongodbCluster/config.xml
index 51b9561dc0f92ff37ff5df40dc93aec8df517935..a360699f2520db1d24d059b8fcd010a30263d5e0 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/MongodbCluster/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/MongodbCluster/config.xml
@@ -38,7 +38,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>MongodbCluster</projectName>
- <projectFullName>Provision/staging/Core/MongodbCluster</projectFullName>
+ <projectFullName>Provision/dev/Core/MongodbCluster</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -65,7 +65,7 @@ return """<b>This parameter is not used</b>"""</script>
</secureFallbackScript>
</script>
<projectName>MongodbCluster</projectName>
- <projectFullName>Provision/staging/Core/MongodbCluster</projectFullName>
+ <projectFullName>Provision/dev/Core/MongodbCluster</projectFullName>
<parameters class="linked-hash-map"/>
<referencedParameters/>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -82,7 +82,7 @@ return """<b>This parameter is not used</b>"""</script>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit/>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
+
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
<scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
@@ -114,4 +114,4 @@ return """<b>This parameter is not used</b>"""</script>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Postgres/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Postgres/config.xml
index 26c84258d19541d0ae1c30c21da346b68a9a5280..ae046ae2454bd090165e4059a564df72333dd3e7 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Postgres/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Postgres/config.xml
@@ -1,6 +1,7 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
<actions/>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -12,80 +13,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196489635829894</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.57">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.57">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Postgres</projectName>
- <projectFullName>Provision/dev/Core/Postgres</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196489639391445</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>""";
+ <secureScript plugin="script-security@1.57">
+ <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>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.57">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Postgres</projectName>
- <projectFullName>Provision/dev/Core/Postgres</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
+ <paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -103,7 +99,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
@@ -114,4 +110,4 @@ return """<b>This parameter is not used</b>"""</script>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml
index d8a68c1d3baf6ebc128e569ce6a1a7d3f205998a..94fd87fc6f558415d6e817dedc1519a81df318e6 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml
@@ -1,6 +1,7 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
<actions/>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -12,80 +13,77 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196490490920280</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.58">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>PostgresDbUpdate</projectName>
- <projectFullName>Provision/dev/Core/PostgresDbUpdate</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196490493760485</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>""";
+ <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>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.58">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>PostgresDbUpdate</projectName>
- <projectFullName>Provision/dev/Core/PostgresDbUpdate</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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>
-
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <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>
<hudson.plugins.git.UserRemoteConfig>
@@ -103,7 +101,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Redis/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Redis/config.xml
index 258e0b0af3d68addc3cd329edb5066ba26fe598e..6aaa2e93e8504c6846a6791a395aefcf0b832319 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Redis/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Redis/config.xml
@@ -99,7 +99,7 @@ return """<b>This parameter is not used</b>"""</script>
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
+ <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/keycloak-test/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/keycloak-test/config.xml
deleted file mode 100644
index 19e29c89936bdc99c6949c06ce79d3b80e987065..0000000000000000000000000000000000000000
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/keycloak-test/config.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>10</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>2</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-196487835595646</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <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>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>keycloak-test</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-196487838166797</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.58">
- <script>if (override_public_branch.equals("true")) {
-return """<input name="value" value="${public_repo_branch}" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Change this value to checkout Jenkinsfile from a different tag or branch.<br>Note: Ideally this value should be same as the branch or tag from which the corresponding Build job was run.</b></font></b></font>""";
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.58">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>keycloak-test</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- </properties>
- <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>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/project-sunbird/sunbird-devops.git</url>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>1</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- </extensions>
- </scm>
- <scriptPath>pipelines/provision/keycloak/Jenkinsfile</scriptPath>
- <lightweight>false</lightweight>
- </definition>
- <triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml
index e37a1573efa8e0958ef4c68c26d07eecbcbbc55d..fc5dc310d9814429d9364e421bc51f263f101672 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -18,80 +19,75 @@
<artifactNumToKeep>2</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196493724128621</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.57">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.57">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>AnalyticsSecor</projectName>
- <projectFullName>Provision/dev/DataPipeline/AnalyticsSecor</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196493728691761</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
+ <secureScript plugin="script-security@1.57">
+ <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.57">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>AnalyticsSecor</projectName>
- <projectFullName>Provision/dev/DataPipeline/AnalyticsSecor</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit/>
+ <paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -109,7 +105,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
@@ -120,4 +116,4 @@ return """<b>This parameter is not used</b>"""</script>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml
index 1d7be9b905976fadb9f485b8fa7036a42abeee14..d596ee135c0b7c741453268758dd15f70602eee2 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,13 +25,13 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-196494527011530</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -39,7 +39,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -51,13 +51,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-196494532752488</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
@@ -66,7 +66,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -80,7 +80,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -91,8 +91,8 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
index 2f1626e388de8ba6db37685250f06454092fd152..d8bc260140fc9a4d5290187dee1ad809179fc293 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -25,23 +25,24 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.5.1">
<name>service</name>
<description><font color=green size=2><b>Choose the services to deploy. Multi-selection is available.</b></font></description>
<randomName>choice-parameter-160652271515504</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<script>return['java',
-'graphite',
+'zookeeper',
'coordinator',
'overlord',
'broker',
'historical',
-'mm']</script>
+'mm',
+'router']</script>
<sandbox>true</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script/>
<sandbox>true</sandbox>
</secureFallbackScript>
@@ -54,9 +55,22 @@
<filterable>false</filterable>
<filterLength>1</filterLength>
</org.biouno.unochoice.CascadeChoiceParameter>
+ <hudson.model.ChoiceParameterDefinition>
+ <name>remote</name>
+ <description><font color=red size=2><b>
+Raw Cluster: [raw]
+Rollup Cluster: [rollup]
+</b></font> </description>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>raw</string>
+ <string>rollup</string>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -67,8 +81,8 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/postgres-managed/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/PostgresManaged/config.xml
similarity index 91%
rename from deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/postgres-managed/config.xml
rename to deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/PostgresManaged/config.xml
index 2b9c16fdad0e2bcc6592706b2033b01c6d39b852..5f925ba920c6c0f5a10cd1884f1543830456b382 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/postgres-managed/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/PostgresManaged/config.xml
@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -24,13 +24,13 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>private_branch</name>
<description/>
<randomName>choice-parameter-196498570819230</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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>"""
}
@@ -38,7 +38,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -50,13 +50,13 @@ return """<b>This parameter is not used</b>"""</script>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.5.1">
<name>branch_or_tag</name>
<description/>
<randomName>choice-parameter-196498577913500</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
+ <secureScript plugin="script-security@1.75">
<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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
@@ -65,7 +65,7 @@ else
return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
+ <secureFallbackScript plugin="script-security@1.75">
<script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -79,7 +79,7 @@ return """<b>This parameter is not used</b>"""</script>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -90,8 +90,8 @@ return """<b>This parameter is not used</b>"""</script>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
index 0f08793d1a3789a17173c251ec8f508b202bd7c5..221b6f3764062373dd9fdd43bd22fccf26e60592 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -25,74 +26,73 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196500122471866</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>true</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Yarn</projectName>
<projectFullName>Provision/dev/DataPipeline/Yarn</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196500128714203</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
+ <secureScript plugin="script-security@1.66">
+ <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-data-pipeline">project-sunbird/sunbird-data-pipeline</a></b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>true</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>true</sandbox>
</secureFallbackScript>
</script>
<projectName>Yarn</projectName>
<projectFullName>Provision/dev/DataPipeline/Yarn</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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>
-
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -110,7 +110,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml
index c311af545b66c8f7c73eeba453f27611b756b958..6897453dd02f425862d14948cc5e08f43c6b0384 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.36">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -25,77 +26,76 @@
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196502397927441</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.66">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>CompositeSearch</projectName>
<projectFullName>Provision/dev/KnowledgePlatform/CompositeSearch</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196502408664232</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
+ <secureScript plugin="script-security@1.66">
+ <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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.66">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>CompositeSearch</projectName>
<projectFullName>Provision/dev/KnowledgePlatform/CompositeSearch</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.75">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +113,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml
index c342840a3d25f2964934ca16f9a42dda933483ba..332ddd651add1796c13d42d71c49c7e900417d76 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -19,83 +20,80 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196503227911555</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.58">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Kafka</projectName>
- <projectFullName>Provision/dev/KnowledgePlatform/Kafka</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196503234123956</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
+ <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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.58">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Kafka</projectName>
- <projectFullName>Provision/dev/KnowledgePlatform/Kafka</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <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>
<hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +111,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
index 47979810f10d4d0f650a71416e62741ce202cbce..b183632daf084ab71a3119d8bef4e37ddd0fbef5 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -19,83 +20,80 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196504004472286</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.57">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.57">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Learning</projectName>
- <projectFullName>Provision/dev/KnowledgePlatform/Learning</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196504007625526</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
+ <secureScript plugin="script-security@1.57">
+ <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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.57">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Learning</projectName>
- <projectFullName>Provision/dev/KnowledgePlatform/Learning</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +111,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
@@ -124,4 +122,4 @@ return """<b>This parameter is not used</b>"""</script>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index 2d490d85a15e75b10d0505936488f6d8995bdbb0..53f8e6264a41d30c0390c468cc19cd661140f666 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -19,83 +20,80 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196504831541165</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.58">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Neo4j</projectName>
- <projectFullName>Provision/dev/KnowledgePlatform/Neo4j</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196504838020082</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
+ <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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.58">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Neo4j</projectName>
- <projectFullName>Provision/dev/KnowledgePlatform/Neo4j</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <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>
<hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +111,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml
index 545feab171ca2cbe2dd36ba3891a29b7f7540919..103cb6d42f93e47310c52d95eee3d944db377a91 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml
@@ -1,4 +1,5 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.32">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
@@ -7,7 +8,7 @@
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
- <description/>
+ <description></description>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
@@ -19,83 +20,78 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>private_branch</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196485017539792</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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>"""
+ <secureScript plugin="script-security@1.57">
+ <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>"""
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.57">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Zookeeper</projectName>
- <projectFullName>Provision/dev/KnowledgePlatform/Zookeeper</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.2.2">
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
<name>branch_or_tag</name>
- <description/>
+ <description></description>
<randomName>choice-parameter-196485022834542</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.71">
- <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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
+ <secureScript plugin="script-security@1.57">
+ <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-learning-platform">project-sunbird/sunbird-learning-platform</a></b></font></b></font>""";
}
else
-return """<b>This parameter is not used</b>"""</script>
+return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.71">
- <script>return """<b>This parameter is not used</b>"""</script>
+ <secureFallbackScript plugin="script-security@1.57">
+ <script>return """<b>This parameter is not used</b>"""</script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
<projectName>Zookeeper</projectName>
- <projectFullName>Provision/dev/KnowledgePlatform/Zookeeper</projectFullName>
<parameters class="linked-hash-map"/>
- <referencedParameters/>
+ <referencedParameters></referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
<omitValueField>true</omitValueField>
</org.biouno.unochoice.DynamicReferenceParameter>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
- <maxConcurrentPerNode>0</maxConcurrentPerNode>
- <maxConcurrentTotal>0</maxConcurrentTotal>
+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
<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/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -113,7 +109,7 @@ return """<b>This parameter is not used</b>"""</script>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
- <reference/>
+ <reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
@@ -124,4 +120,4 @@ return """<b>This parameter is not used</b>"""</script>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>