From c148c978ea85bc4e1686cdb010d1c6fc0e61f3c0 Mon Sep 17 00:00:00 2001
From: keshavprasadms <msknext@gmail.com>
Date: Tue, 25 Jun 2019 14:34:41 +0530
Subject: [PATCH] feat: Merge jenkins configs from master
---
deploy/jenkins/jenkins-jobs-setup.sh | 7 +-
deploy/jenkins/jenkins-server-setup.sh | 17 +-
.../dev/jobs/Core/jobs/APIManager/config.xml | 6 +-
.../jobs/Core/jobs/APIManagerEcho/config.xml | 6 +-
.../dev/jobs/Core/jobs/AdminUtils/config.xml | 68 +++---
.../jobs/dev/jobs/Core/jobs/Badger/config.xml | 6 +-
.../dev/jobs/Core/jobs/Cassandra/config.xml | 6 +-
.../Core/jobs/CassandraTrigger/config.xml | 108 +++++++++
.../jobs/dev/jobs/Core/jobs/Config/config.xml | 6 +-
.../dev/jobs/Core/jobs/Content/config.xml | 6 +-
.../dev/jobs/Core/jobs/Keycloak/config.xml | 6 +-
.../dev/jobs/Core/jobs/Learner/config.xml | 6 +-
.../jobs/dev/jobs/Core/jobs/Player/config.xml | 6 +-
.../jobs/dev/jobs/Core/jobs/Proxy/config.xml | 6 +-
.../dev/jobs/Core/jobs/Telemetry/config.xml | 6 +-
.../jobs/dev/jobs/Core/jobs/Yarn/config.xml | 108 +++++++++
.../jobs/dev/jobs/DataPipeline/config.xml | 6 +-
.../DataPipeline/jobs/Analytics/config.xml | 6 +-
.../DataPipeline/jobs/DataPipeline/config.xml | 6 +-
.../DataPipeline/jobs/MLWorkbench/config.xml | 109 +++++++++
.../jobs/DataPipeline/jobs/Secor/config.xml | 6 +-
.../jobs/KnowledgePlatform/config.xml | 6 +-
.../KnowledgePlatform/jobs/Neo4j/config.xml | 6 +-
.../jobs/SyncTool/config.xml | 6 +-
.../KnowledgePlatform/jobs/Yarn/config.xml | 6 +-
.../jobs/dev/jobs/Plugins/config.xml | 7 +-
.../Plugins/jobs/CollectionEditor/config.xml | 5 +-
.../{CEPlugins => ContentEditor}/config.xml | 14 +-
.../config.xml | 14 +-
.../config.xml | 14 +-
.../Plugins/jobs/GenericEditor/config.xml | 6 +-
.../jobs/Core/jobs/APIManager/config.xml | 43 ++--
.../Build/jobs/Core/jobs/Badger/config.xml | 4 +-
.../Build/jobs/Core/jobs/Cassandra/config.xml | 4 +-
.../Core/jobs/CassandraTrigger/config.xml | 109 +++++++++
.../jobs/Core/jobs/CloudStorageSDK/config.xml | 4 +-
.../Build/jobs/Core/jobs/Config/config.xml | 7 +-
.../Build/jobs/Core/jobs/Content/config.xml | 4 +-
.../Build/jobs/Core/jobs/Keycloak/config.xml | 4 +-
.../Build/jobs/Core/jobs/Learner/config.xml | 10 +-
.../Build/jobs/Core/jobs/Player/config.xml | 10 +-
.../Build/jobs/Core/jobs/Proxy/config.xml | 4 +-
.../Build/jobs/Core/jobs/Telemetry/config.xml | 4 +-
.../jobs/Build/jobs/Core/jobs/Yarn/config.xml | 84 +++++++
.../jobs/Build/jobs/DataPipeline/config.xml | 6 +-
.../DataPipeline/jobs/Analytics/config.xml | 4 +-
.../DataPipeline/jobs/DataPipeline/config.xml | 4 +-
.../DataPipeline/jobs/MLWorkbench/config.xml | 80 +++++++
.../jobs/DataPipeline/jobs/Secor/config.xml | 4 +-
.../jobs/KnowledgePlatform/config.xml | 10 +-
.../KnowledgePlatform/jobs/Neo4j/config.xml | 4 +-
.../jobs/SyncTool/config.xml | 4 +-
.../KnowledgePlatform/jobs/Yarn/config.xml | 10 +-
.../jobs/Build/jobs/Plugins/config.xml | 6 +-
.../Plugins/jobs/CollectionEditor/config.xml | 4 +-
.../config.xml | 8 +-
.../config.xml | 8 +-
.../{CEPlugins => ContentPlugins}/config.xml | 13 +-
.../Plugins/jobs/GenericEditor/config.xml | 4 +-
.../dev/jobs/Core/jobs/APIManager/config.xml | 59 ++++-
.../dev/jobs/Core/jobs/AdminUtils/config.xml | 59 ++++-
.../jobs/ApplicationElasticSearch/config.xml | 67 +++++-
.../jobs/dev/jobs/Core/jobs/Badger/config.xml | 59 ++++-
.../dev/jobs/Core/jobs/Bootstrap/config.xml | 57 ++++-
.../dev/jobs/Core/jobs/Cassandra/config.xml | 83 +++++--
.../Core/jobs/CassandraTrigger/config.xml | 213 ++++++++++++++++++
.../jobs/dev/jobs/Core/jobs/Config/config.xml | 59 ++++-
.../dev/jobs/Core/jobs/Content/config.xml | 59 ++++-
.../Core/jobs/FuntionalTestCases/config.xml | 16 +-
.../dev/jobs/Core/jobs/Keycloak/config.xml | 65 +++++-
.../jobs/Core/jobs/KeycloakRealm/config.xml | 69 +++++-
.../dev/jobs/Core/jobs/Learner/config.xml | 59 ++++-
.../dev/jobs/Core/jobs/Logging/config.xml | 65 +++++-
.../dev/jobs/Core/jobs/Logstash/config.xml | 118 ++++++++++
.../dev/jobs/Core/jobs/Monitoring/config.xml | 65 +++++-
.../dev/jobs/Core/jobs/OnboardAPIs/config.xml | 67 +++++-
.../Core/jobs/OnboardConsumers/config.xml | 67 +++++-
.../jobs/dev/jobs/Core/jobs/Player/config.xml | 71 +++++-
.../jobs/dev/jobs/Core/jobs/Proxy/config.xml | 65 +++++-
.../dev/jobs/Core/jobs/Telemetry/config.xml | 59 ++++-
.../Core/jobs/TelemetryLogstash/config.xml | 65 +++++-
.../TelemetryLogstashDataPipeline/config.xml | 67 +++++-
.../jobs/dev/jobs/Core/jobs/Yarn/config.xml | 202 +++++++++++++++++
.../jobs/dev/jobs/DataPipeline/config.xml | 6 +-
.../DataPipeline/jobs/AnalyticsAPI/config.xml | 65 +++++-
.../jobs/AnalyticsFetchLogs/config.xml | 61 ++++-
.../AnalyticsGeoLocationDBSetup/config.xml | 69 +++++-
.../config.xml | 74 +++++-
.../jobs/AnalyticsReplayJobs/config.xml | 69 +++++-
.../jobs/AnalyticsStartJobManager/config.xml | 68 +++++-
.../jobs/AnalyticsSubmitJobs/config.xml | 65 +++++-
.../jobs/CassandraDbUpdate/config.xml | 67 +++++-
.../DataPipeline/jobs/DataProducts/config.xml | 85 +++++--
.../DataPipeline/jobs/KafkaIndexer/config.xml | 67 +++++-
.../DataPipeline/jobs/KafkaSetup/config.xml | 67 +++++-
.../DataPipeline/jobs/MLWorkbench/config.xml | 97 ++++++++
.../DataPipeline/jobs/Monitoring/config.xml | 67 +++++-
.../jobs/SamzaTelemetrySchemas/config.xml | 59 ++++-
.../jobs/DataPipeline/jobs/Secor/config.xml | 85 +++++--
.../jobs/DataPipeline/jobs/Yarn/config.xml | 85 +++++--
.../jobs/AssetSizeMigration/config.xml | 210 +++++++++++++++++
.../jobs/CassandraDbUpdate/config.xml | 67 +++++-
.../jobs/ContentTool/config.xml | 61 ++++-
.../jobs/FileSyncTool/config.xml | 59 ++++-
.../jobs/KafkaSetup/config.xml | 67 +++++-
.../jobs/Learning/config.xml | 85 +++++--
.../jobs/Monitoring/config.xml | 69 +++++-
.../KnowledgePlatform/jobs/Neo4j/config.xml | 65 +++++-
.../jobs/Neo4jDefinitionUpdate/config.xml | 69 +++++-
.../Neo4jElasticSearchSyncTool/config.xml | 69 +++++-
.../KnowledgePlatform/jobs/Search/config.xml | 65 +++++-
.../jobs/StartNeo4jCluster/config.xml | 67 +++++-
.../jobs/StopNeo4jCluster/config.xml | 67 +++++-
.../jobs/ValidateLearning/config.xml | 69 +++++-
.../KnowledgePlatform/jobs/Yarn/config.xml | 85 +++++--
.../Deploy/jobs/dev/jobs/Plugins/config.xml | 6 +-
.../Plugins/jobs/CollectionEditor/config.xml | 86 +++++--
.../config.xml | 96 +++++---
.../config.xml | 96 +++++---
.../{CEPlugins => ContentPlugins}/config.xml | 96 +++++---
.../Plugins/jobs/GenericEditor/config.xml | 86 +++++--
.../ApplicationElasticsearchBackup/config.xml | 82 ++++++-
.../config.xml | 73 +++++-
.../dev/jobs/Core/jobs/Bootstrap/config.xml | 65 +++++-
.../jobs/Core/jobs/CassandraBackup/config.xml | 84 ++++++-
.../dev/jobs/Core/jobs/CreateUser/config.xml | 140 ++++++++++++
.../dev/jobs/Core/jobs/ESMapping}/config.xml | 11 +-
.../jobs/Core/jobs/GrafanaBackup/config.xml | 117 ++++++++++
.../dev/jobs/Core/jobs/KeyRotation/config.xml | 71 +++++-
.../jobs/LoggerElasticSearchBackup/config.xml | 84 ++++++-
.../LoggerElasticSearchRestore/config.xml | 75 +++++-
.../Core/jobs/PostgresqlBackup/config.xml | 74 +++++-
.../Core/jobs/PostgresqlRestore/config.xml | 74 +++++-
.../Core/jobs/PrometheusBackup/config.xml | 84 ++++++-
.../jobs/Core/jobs/SwarmBootstrap/config.xml | 75 +++++-
.../jobs/dev/jobs/DataPipeline/config.xml | 8 +-
.../jobs/AnalyticsAPILogs/config.xml | 51 -----
.../DataPipeline/jobs/Bootstrap/config.xml | 71 +++++-
.../jobs/CassandraBackup/config.xml | 72 +++++-
.../jobs/CassandraRestore/config.xml | 72 +++++-
.../DataPipeline/jobs/CreateUser/config.xml | 140 ++++++++++++
.../jobs/CustomMonitoring/config.xml | 140 ++++++++++++
.../jobs/ElasticsearchBackup/config.xml | 72 +++++-
.../jobs/ElasticsearchRestore/config.xml | 73 +++++-
.../jobs/InfluxDBBackup/config.xml | 76 ++++++-
.../DataPipeline/jobs/KeyRotation/config.xml | 145 ++++++++++++
.../jobs/PostgresqlBackup/config.xml | 74 +++++-
.../jobs/PostgresqlRestore/config.xml | 74 +++++-
.../jobs/SamzaMonitoringProvision/config.xml | 67 ++++++
.../jobs/SamzaOrphanprocessAlert/config.xml | 85 +++++++
.../jobs/Bootstrap/config.xml | 70 +++++-
.../jobs/CassandraBackup/config.xml | 68 +++++-
.../jobs/CassandraRestore/config.xml | 70 +++++-
.../jobs/CreateUser/config.xml | 140 ++++++++++++
.../jobs/ElasticsearchBackup/config.xml | 82 ++++++-
.../jobs/ElasticsearchRestore/config.xml | 80 ++++++-
.../jobs/KeyRotation/config.xml | 145 ++++++++++++
.../jobs/Neo4jBackup/config.xml | 72 +++++-
.../jobs/Neo4jRestore/config.xml | 63 +++++-
.../jobs/RedisBackup/config.xml | 122 ++++++++++
.../Provision/jobs/dev/jobs/Core/config.xml | 8 +-
.../dev/jobs/Core/jobs/Cassandra/config.xml | 67 +++++-
.../jobs/Core/jobs/JenkinsSlave/config.xml | 4 +-
.../jobs/dev/jobs/Core/jobs/Kafka/config.xml | 69 +++++-
.../dev/jobs/Core/jobs/Keycloak/config.xml | 76 +++++--
.../Core/jobs/LogElasticSearch/config.xml | 76 ++++++-
.../dev/jobs/Core/jobs/Logstash/config.xml | 115 ++++++++++
.../dev/jobs/Core/jobs/Postgres/config.xml | 75 +++++-
.../Core/jobs/PostgresDbUpdate/config.xml | 75 +++++-
.../dev/jobs/Core/jobs/Registry/config.xml | 69 +++++-
.../jobs/dev/jobs/Core/jobs/Secor/config.xml | 69 +++++-
.../jobs/dev/jobs/DataPipeline/config.xml | 6 +-
.../DataPipeline/jobs/AnalyticsAPI/config.xml | 77 ++++++-
.../jobs/AnalyticsSecor/config.xml | 77 ++++++-
.../jobs/AnalyticsSpark/config.xml | 77 ++++++-
.../DataPipeline/jobs/Cassandra/config.xml | 86 ++++++-
.../jobs/DataPipeline/jobs/Druid/config.xml | 67 ++++++
.../DataPipeline/jobs/InfluxDB/config.xml | 77 ++++++-
.../jobs/DataPipeline/jobs/Kafka/config.xml | 69 +++++-
.../jobs/DataPipeline/jobs/Kibana/config.xml | 77 ++++++-
.../DataPipeline/jobs/MLWorkbench/config.xml | 67 ++++++
.../DataPipeline/jobs/Postgres/config.xml | 77 ++++++-
.../jobs/Redis_Cluster/config.xml | 125 ++++++++++
.../jobs/TelemetrySearch/config.xml | 71 +++++-
.../jobs/DataPipeline/jobs/Yarn/config.xml | 77 ++++++-
.../DataPipeline/jobs/Zookeeper/config.xml | 69 +++++-
.../jobs/Cassandra/config.xml | 74 +++++-
.../jobs/CompositeSearch/config.xml | 76 ++++++-
.../KnowledgePlatform/jobs/Kafka/config.xml | 74 +++++-
.../jobs/Learning/config.xml | 69 +++++-
.../KnowledgePlatform/jobs/Neo4j/config.xml | 76 ++++++-
.../KnowledgePlatform/jobs/Redis/config.xml | 76 ++++++-
.../jobs/Redis_Cluster/config.xml | 125 ++++++++++
.../KnowledgePlatform/jobs/Search/config.xml | 77 ++++++-
.../KnowledgePlatform/jobs/Yarn/config.xml | 69 +++++-
.../jobs/Zookeeper/config.xml | 74 +++++-
deploy/jenkins/plugins.txt | 97 ++++----
197 files changed, 10467 insertions(+), 1145 deletions(-)
create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Yarn/config.xml
create mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
rename deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/{CEPlugins => ContentEditor}/config.xml (88%)
rename deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/{ContentFramework => ContentPlayer}/config.xml (88%)
rename deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/{ContentRendererPreview => ContentPlugins}/config.xml (88%)
create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
create mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
create mode 100644 deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
rename deploy/jenkins/jobs/Build/jobs/Plugins/jobs/{ContentFramework => ContentEditor}/config.xml (95%)
rename deploy/jenkins/jobs/Build/jobs/Plugins/jobs/{ContentRendererPreview => ContentPlayer}/config.xml (95%)
rename deploy/jenkins/jobs/Build/jobs/Plugins/jobs/{CEPlugins => ContentPlugins}/config.xml (89%)
create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logstash/config.xml
create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml
create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
create mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/AssetSizeMigration/config.xml
rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/{ContentFramework => ContentEditor}/config.xml (58%)
rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/{ContentRendererPreview => ContentPlayer}/config.xml (58%)
rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/{CEPlugins => ContentPlugins}/config.xml (58%)
create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml
rename deploy/jenkins/jobs/{Deploy/jobs/dev/jobs/Core/jobs/LoggerElasticSearch => OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping}/config.xml (87%)
create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPILogs/config.xml
create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CreateUser/config.xml
create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CustomMonitoring/config.xml
create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/KeyRotation/config.xml
create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml
create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml
create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CreateUser/config.xml
create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml
create mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml
create mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Logstash/config.xml
create mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
create mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
create mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Redis_Cluster/config.xml
create mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis_Cluster/config.xml
diff --git a/deploy/jenkins/jenkins-jobs-setup.sh b/deploy/jenkins/jenkins-jobs-setup.sh
index 5e71deb9f..04abe3009 100755
--- a/deploy/jenkins/jenkins-jobs-setup.sh
+++ b/deploy/jenkins/jenkins-jobs-setup.sh
@@ -22,6 +22,7 @@ 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' {} \;
echo -e "\e[0;33m${bold}Jobs created for ${arr[0]}${normal}"
for key in "${!arr[@]}"; do
@@ -31,8 +32,8 @@ setupJobs(){
cp -r $JENKINS_TMP/Provision/jobs/${arr[0]} $JENKINS_TMP/Provision/jobs/${arr[$key]}
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 sed -i "s#ArtifactUpload/${arr[0]}/#Deploy/${arr[$(($key - 1))]}/#g" {} \;
- find $JENKINS_TMP/Deploy/jobs/${arr[$key]} -type d -path "*Summary*" -prune -o -type f -name config.xml -exec sed -i "/<triggers>/,/<\/triggers>/d" {} \;
+ 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]}/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
@@ -41,7 +42,7 @@ setupJobs(){
echo -e "\e[0;33m${bold}No changes detected. Exiting...${normal}"
exit
fi
- colordiff -r --suppress-common-lines --no-dereference -x 'nextBuildNumber' -x 'builds' -x 'last*' /var/lib/jenkins/jobs $JENKINS_TMP
+ colordiff -r --suppress-common-lines --no-dereference -x 'nextBuildNumber' -x 'builds' -x 'last*' --suppress-blank-empty --ignore-tab-expansion --ignore-trailing-space --ignore-space-change --ignore-matching-lines='<com.cloudbees' --ignore-matching-lines='<org.jenkinsci' --ignore-matching-lines='<registry plugin' --ignore-matching-lines='<flow-definition' --ignore-matching-lines='<com.sonyericsson' --ignore-matching-lines='<org.biouno' --ignore-matching-lines='<secureScript' --ignore-matching-lines='<secureFallbackScript' --ignore-matching-lines='<hudson.plugins' --ignore-matching-lines='<definition class' --ignore-matching-lines='<scm class' --ignore-matching-lines='</flow' --ignore-matching-lines='<configVersion>' --ignore-matching-lines='<visibleItemCount>' --ignore-matching-lines='<parameters class' /var/lib/jenkins/jobs $JENKINS_TMP
echo -e "\e[0;33m${bold}Please review the changes shown. Proceed with overwriting the changes?${normal}"
}
diff --git a/deploy/jenkins/jenkins-server-setup.sh b/deploy/jenkins/jenkins-server-setup.sh
index cea6ddf03..6ccb350fd 100755
--- a/deploy/jenkins/jenkins-server-setup.sh
+++ b/deploy/jenkins/jenkins-server-setup.sh
@@ -12,7 +12,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 -
sudo apt-add-repository "deb https://pkg.jenkins.io/debian-stable binary/"
sudo apt-get update
-sudo apt-get install -y jenkins=2.150.3
+sudo apt-get install -y jenkins=2.164.2
echo -e "\n\e[0;32m${bold}Installating PIP${normal}"
apt-get install -y python-pip
@@ -55,12 +55,27 @@ ln -s /usr/local/lib/node-v6.1.0-linux-x64/bin/gulp /usr/bin/gulp
echo -e "\n\e[0;32m${bold}Installating Ansible${normal}"
pip install ansible==2.5.0
+echo -e "\n\e[0;32m${bold}Installating azure cli${normal}"
+apt-get install curl apt-transport-https lsb-release gpg
+curl -sL https://packages.microsoft.com/keys/microsoft.asc | \
+ gpg --dearmor | \
+ sudo tee /etc/apt/trusted.gpg.d/microsoft.asc.gpg > /dev/null
+AZ_REPO=$(lsb_release -cs)
+echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $AZ_REPO main" | \
+ sudo tee /etc/apt/sources.list.d/azure-cli.list
+sudo apt-get update
+sudo apt-get install azure-cli
+
echo -e "\n\e[0;32m${bold}Installating Docker-py${normal}"
pip install docker-py
echo -e "\n\e[0;32m${bold}Installating colordiff${normal}"
sudo apt-get install -y colordiff
+echo -e "\n\e[0;32m${bold}Installating git lfs${normal}"
+curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
+apt-get install git-lfs
+
echo -e "\n\e[0;32m${bold}Adding jenkins user to docker group${normal}"
usermod -aG docker jenkins
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManager/config.xml
index ad7e37aed..a3e8cbe68 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManager/config.xml
@@ -28,7 +28,7 @@
<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>
+ <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/APIManager</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Push the docker image to container registry.
</b></font></description>
<choices class="java.util.Arrays$ArrayList">
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManagerEcho/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManagerEcho/config.xml
index 77af8f791..cc051470f 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManagerEcho/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/APIManagerEcho/config.xml
@@ -28,7 +28,7 @@
<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>
+ <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/APIManagerEcho</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Push the docker image to container registry.
</b></font></description>
<choices class="java.util.Arrays$ArrayList">
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
index b49d708c4..397432f38 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
@@ -7,28 +7,36 @@
<string>com.sonyericsson.rebuild.RebuildSettings</string>
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
+ <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobAction plugin="pipeline-model-definition@1.3.4.1"/>
+ <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction plugin="pipeline-model-definition@1.3.4.1">
+ <jobProperties/>
+ <triggers/>
+ <parameters/>
+ <options/>
+ </org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction>
</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.29">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
+ <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+ <triggers>
+ <jenkins.triggers.ReverseBuildTrigger>
+ <spec></spec>
+ <upstreamProjects>/Build/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>
<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>
+ <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/AdminUtils</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +48,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Push the docker image to container registry.
</b></font></description>
<choices class="java.util.Arrays$ArrayList">
@@ -51,6 +59,19 @@ ArtifactRepo - Push the docker image to container registry.
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
+ <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.29">
+ <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>
@@ -59,21 +80,8 @@ ArtifactRepo - Push the docker image to container registry.
<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>/Build/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">
@@ -105,4 +113,4 @@ ArtifactRepo - Push the docker image to container registry.
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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/Badger/config.xml
index 8a360779a..7a4b219bb 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml
@@ -28,7 +28,7 @@
<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>
+ <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>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Push the docker image to container registry.
</b></font></description>
<choices class="java.util.Arrays$ArrayList">
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
index 06009718e..08e2a6496 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
@@ -28,7 +28,7 @@
<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>
+ <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/Cassandra</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -105,4 +105,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
new file mode 100644
index 000000000..7df13ead9
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
@@ -0,0 +1,108 @@
+<?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>-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.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>Build/Core/CassandraTrigger</defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>build_number</name>
+ <description><font color=darkgreen size=2><b>OPTIONAL: Specify the build job number to upload / copy the artifact built in that job.</b></font></description>
+ <defaultValue>lastSuccessfulBuild</defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.ChoiceParameterDefinition>
+ <name>artifact_source</name>
+ <description><font color=dimgray size=2><b>
+ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>ArtifactRepo</string>
+ <string>JenkinsJob</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>Build/Core/CassandraTrigger</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>${public_repo_branch}</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/upload/artifacts/Jenkinsfile</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
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/Config/config.xml
index 87cfd3e82..63b79ae5a 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Config/config.xml
@@ -28,7 +28,7 @@
<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>
+ <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>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Push the docker image to container registry.
</b></font></description>
<choices class="java.util.Arrays$ArrayList">
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 184683d64..ee29acd2a 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
@@ -28,7 +28,7 @@
<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>
+ <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/Content</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Push the docker image to container registry.
</b></font></description>
<choices class="java.util.Arrays$ArrayList">
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 d44ca7a71..56e5f8b78 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
@@ -28,7 +28,7 @@
<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>
+ <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/Keycloak</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -105,4 +105,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Learner/config.xml
index 41067d62d..c5ea94efe 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Learner/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Learner/config.xml
@@ -28,7 +28,7 @@
<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>
+ <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/Learner</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Push the docker image to container registry.
</b></font></description>
<choices class="java.util.Arrays$ArrayList">
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 2ee20d9bc..a60c0a1ec 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
@@ -28,7 +28,7 @@
<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>
+ <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/Player</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Push the docker image to container registry.
</b></font></description>
<choices class="java.util.Arrays$ArrayList">
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Proxy/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Proxy/config.xml
index b3a102f15..281955d43 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Proxy/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Proxy/config.xml
@@ -28,7 +28,7 @@
<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>
+ <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/Proxy</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Push the docker image to container registry.
</b></font></description>
<choices class="java.util.Arrays$ArrayList">
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
index f8d7173a2..9bb6a0028 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
@@ -28,7 +28,7 @@
<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>
+ <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/Telemetry</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Push the docker image to container registry.
</b></font></description>
<choices class="java.util.Arrays$ArrayList">
@@ -105,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Yarn/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Yarn/config.xml
new file mode 100644
index 000000000..846956588
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Yarn/config.xml
@@ -0,0 +1,108 @@
+<?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>-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>Build/Core/Yarn</defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>build_number</name>
+ <description><font color=darkgreen size=2><b>OPTIONAL: Specify the build job number to upload / copy the artifact built in that job.</b></font></description>
+ <defaultValue>lastSuccessfulBuild</defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.ChoiceParameterDefinition>
+ <name>artifact_source</name>
+ <description><font color=dimgray size=2><b>
+ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>ArtifactRepo</string>
+ <string>JenkinsJob</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>/Build/Core/Yarn</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>${public_repo_branch}</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/upload/artifacts/Jenkinsfile</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/config.xml
index 68477b8ac..5be56a4e0 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/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.7">
+<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.4.1">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.13"/>
+ <registry plugin="docker-commons@1.14"/>
</org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Analytics/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Analytics/config.xml
index ea3935f10..e030ca1a3 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Analytics/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Analytics/config.xml
@@ -28,7 +28,7 @@
<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>
+ <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/DataPipeline/Analytics</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -105,4 +105,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataPipeline/config.xml
index d46ea63bc..c1e776515 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/DataPipeline/config.xml
@@ -28,7 +28,7 @@
<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>
+ <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/DataPipeline/DataPipeline</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -105,4 +105,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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
new file mode 100644
index 000000000..5404767f9
--- /dev/null
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -0,0 +1,109 @@
+<?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>-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=black size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <defaultValue>/Build/DataPipeline/ml-workbench</defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <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>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.ChoiceParameterDefinition>
+ <name>artifact_source</name>
+ <description><font color=black size=2><b>
+ArtifactRepo - Push the docker image to container registry.
+</b></font></description>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>ArtifactRepo</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>
+ <jenkins.triggers.ReverseBuildTrigger>
+ <spec></spec>
+ <upstreamProjects>/Build/DataPipeline/MLWorkbench</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>${public_repo_branch}</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/upload/docker/Jenkinsfile</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
index 667166840..c7a78032b 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
@@ -28,7 +28,7 @@
<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>
+ <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/DataPipeline/Secor</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -105,4 +105,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 73e480baa..7dc23f5af 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
@@ -28,7 +28,7 @@
<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>
+ <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/KnowledgePlatform/KnowledgePlatform</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -105,4 +105,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index b7727db72..e3162085b 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -28,7 +28,7 @@
<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>
+ <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/KnowledgePlatform/Neo4j</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -105,4 +105,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/SyncTool/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
index 991e40515..c3ad728f7 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
@@ -28,7 +28,7 @@
<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>
+ <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/KnowledgePlatform/SyncTool</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -105,4 +105,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 b45c513b5..709f243f2 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
@@ -28,7 +28,7 @@
<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>
+ <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/KnowledgePlatform/Yarn</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -40,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -105,4 +105,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/config.xml
index e25dcd134..5be56a4e0 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/config.xml
@@ -1,10 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
+<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.4.1">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.13"/>
+ <registry plugin="docker-commons@1.14"/>
</org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
index b071455dd..fe9ade6a1 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
@@ -21,7 +21,7 @@
<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>
+ <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/Plugins/CollectionEditor</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -33,7 +33,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -52,6 +52,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
<throttleOption>project</throttleOption>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
+ <configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CEPlugins/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
similarity index 88%
rename from deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CEPlugins/config.xml
rename to deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
index 5c380348d..9b43d7d8f 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CEPlugins/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -21,8 +21,8 @@
<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>Build/Plugins/CEPlugins</defaultValue>
+ <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/Plugins/ContentEditor</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
@@ -33,7 +33,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -57,7 +57,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec></spec>
- <upstreamProjects>Build/Plugins/CEPlugins</upstreamProjects>
+ <upstreamProjects>Build/Plugins/ContentEditor</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -68,7 +68,7 @@ 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.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentFramework/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
similarity index 88%
rename from deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentFramework/config.xml
rename to deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
index 0e4c842ce..6dcf3f76b 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentFramework/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -21,8 +21,8 @@
<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>Build/Plugins/ContentFramework</defaultValue>
+ <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/Plugins/ContentPlayer</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
@@ -33,7 +33,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -57,7 +57,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec></spec>
- <upstreamProjects>Build/Plugins/ContentFramework</upstreamProjects>
+ <upstreamProjects>Build/Plugins/ContentPlayer</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -68,7 +68,7 @@ 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.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentRendererPreview/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
similarity index 88%
rename from deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentRendererPreview/config.xml
rename to deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
index f699829e2..0d3a13392 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentRendererPreview/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -21,8 +21,8 @@
<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>Build/Plugins/ContentRendererPreview</defaultValue>
+ <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/Plugins/ContentPlugins</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
@@ -33,7 +33,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -57,7 +57,7 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec></spec>
- <upstreamProjects>Build/Plugins/ContentRendererPreview</upstreamProjects>
+ <upstreamProjects>Build/Plugins/ContentPlugins</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -68,7 +68,7 @@ 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.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
index 4ce788e56..4f2734409 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
@@ -21,7 +21,7 @@
<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>
+ <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/Plugins/GenericEditor</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -33,7 +33,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <description><font color=dimgray size=2><b>
ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - Just keep a copy of the artifact in Jenkins.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -90,4 +90,4 @@ ArtifactRepo - Upload and keep a copy of the artifact in Jenkins, JenkinsJob - J
</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/APIManager/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
index e774141dd..4a039c448 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
@@ -1,14 +1,16 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
<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>
@@ -16,23 +18,26 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.63">
- <script>node(){
- build_tag="1.8.0-gold"
- name="kong"
- node=env.NODE_NAME
- org=env.hub_org
-
- sh """
- docker pull sunbird/kong:1.8.0-gold
- docker tag sunbird/kong:1.8.0-gold ${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 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</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/>
+ </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/Badger/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
index 47f3fd52b..a19a4fe04 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Badger/config.xml
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,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/Cassandra/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
index 8aef6a2b1..d77cfadf3 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,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/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
new file mode 100644
index 000000000..b210fdcb1
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
@@ -0,0 +1,109 @@
+<?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>-1</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>10</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>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>public_branch</name>
+ <description></description>
+ <randomName>choice-parameter-2542933652582165</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>CassandraTrigger</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>
+ <com.cloudbees.jenkins.GitHubPushTrigger plugin="github@1.29.4">
+ <spec></spec>
+ </com.cloudbees.jenkins.GitHubPushTrigger>
+ </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-utils.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.trigger</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml
index aaba53827..ef4e58fa8 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CloudStorageSDK/config.xml
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml
index 24de44f2a..69fada37d 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml
@@ -42,6 +42,7 @@
<throttleOption>project</throttleOption>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
+ <configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
@@ -61,7 +62,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -80,5 +81,5 @@
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+ <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 5e188b455..e570ec529 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
@@ -54,7 +54,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -74,4 +74,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/Keycloak/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
index 19f208676..55b940ce0 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
@@ -54,7 +54,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -74,4 +74,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/Learner/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
index 7effd5e77..16bec1304 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -51,7 +51,7 @@
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
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 91415a2d4..c6ef2fe93 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Player/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -51,7 +51,7 @@
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
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 82d230efb..544ddccc7 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Proxy/config.xml
@@ -52,7 +52,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -72,4 +72,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/Telemetry/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
index ae99c15c5..fd47188c6 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,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/Yarn/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
new file mode 100644
index 000000000..65c3c4c5d
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
@@ -0,0 +1,84 @@
+<?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>-1</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>10</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>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>
+ <com.cloudbees.jenkins.GitHubPushTrigger plugin="github@1.29.4">
+ <spec></spec>
+ </com.cloudbees.jenkins.GitHubPushTrigger>
+ </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-lms-jobs.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/Jenkinsfile</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/config.xml
index 68477b8ac..5be56a4e0 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/Build/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.7">
+<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.4.1">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.13"/>
+ <registry plugin="docker-commons@1.14"/>
</org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
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 692838a32..833d261ee 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Analytics/config.xml
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 aeadd32be..acd6b196b 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/DataPipeline/config.xml
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
new file mode 100644
index 000000000..b51e8a319
--- /dev/null
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -0,0 +1,80 @@
+<?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>-1</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>10</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/>
+ </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/smyaltamash/sunbird-ml-workbench.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/DataPipeline/jobs/Secor/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
index dae00811d..442129420 100644
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/Secor/config.xml
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>secor-0.25</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 a631630f3..d2f5a42be 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/KnowledgePlatform/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -51,7 +51,7 @@
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
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 b0d44a444..f545a823a 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 d057b1b82..0632b08b6 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/SyncTool/config.xml
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 4b67a7fe7..061e714fa 100644
--- a/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -58,7 +58,7 @@
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -68,7 +68,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/config.xml
index 68477b8ac..5be56a4e0 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/config.xml
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
+<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.4.1">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.13"/>
+ <registry plugin="docker-commons@1.14"/>
</org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
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 4c72168f2..ada41eaed 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CollectionEditor/config.xml
@@ -47,7 +47,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -67,4 +67,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentFramework/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
similarity index 95%
rename from deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentFramework/config.xml
rename to deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
index 0b658bc43..f62674f83 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentFramework/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -37,7 +37,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -47,7 +47,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentRendererPreview/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
similarity index 95%
rename from deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentRendererPreview/config.xml
rename to deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
index 5256477d2..efd584951 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentRendererPreview/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -37,7 +37,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -47,7 +47,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CEPlugins/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
similarity index 89%
rename from deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CEPlugins/config.xml
rename to deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
index 0280e4893..7d87bd630 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CEPlugins/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -36,8 +36,11 @@
<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">
+ <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>
@@ -47,7 +50,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -67,4 +70,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 0c8521698..85c97b29a 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/GenericEditor/config.xml
@@ -47,7 +47,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${github_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -67,4 +67,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml
index 817790d54..30513fa44 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml
@@ -28,16 +28,67 @@
<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>
+ <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, latest built image will be deployed.</b></font></description>
+ <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>APIManager</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>APIManager</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">
@@ -74,7 +125,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -94,4 +145,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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
index 3f6023230..c9eb87767 100644
--- 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
@@ -28,16 +28,67 @@
<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>
+ <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, latest built image will be deployed.</b></font></description>
+ <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">
@@ -74,7 +125,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -94,4 +145,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ApplicationElasticSearch/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ApplicationElasticSearch/config.xml
index 360fb0873..33dcb7914 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ApplicationElasticSearch/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ApplicationElasticSearch/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,11 +13,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-186487879604743</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>ApplicationElasticSearch</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-186487885338467</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>ApplicationElasticSearch</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>
@@ -25,7 +82,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -35,7 +92,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -55,4 +112,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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
index fef35385e..2a243f37d 100644
--- 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
@@ -28,16 +28,67 @@
<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>
+ <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, latest built image will be deployed.</b></font></description>
+ <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>Badger</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>Badger</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">
@@ -63,7 +114,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -83,4 +134,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
index d18ba3095..54d79c38f 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
@@ -20,10 +20,61 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>hosts</name>
- <description><font color=black size=2><b>Enter the host name to be bootstrapped.</b></font></description>
+ <description><font color=dimgray size=2><b>Enter the host name to be bootstrapped.</b></font></description>
<defaultValue>all</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>Bootstrap</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>Bootstrap</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">
@@ -46,7 +97,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -58,4 +109,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
index bc84353c7..aa59259e3 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -21,25 +21,25 @@
<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>
+ <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/Cassandra</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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.53">
+ <secureScript plugin="script-security@1.58">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -57,7 +57,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<randomName>choice-parameter-9600651313765</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("JenkinsJob")) {
return """<input name="value" value="lastSuccessfulBuild" class="setting-input" type="text"><br> <font color=darkgreen size=2><b>OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.</b></font>"""
}
@@ -67,7 +67,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -84,16 +84,16 @@ return "<b>Not Applicable</b>"
<randomName>choice-parameter-9600653373369</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("ArtifactRepo")) {
-return """<input name="value" value="" class="setting-input" type="text"> <br> <font color=red size=2><b>CAUTION: If the value is blank, latest built artifact will be deployed.</b></font>"""
+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.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -104,6 +104,57 @@ 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.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>Cassandra</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>Cassandra</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">
@@ -130,7 +181,7 @@ return "<b>Not Applicable</b>"
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -140,7 +191,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -160,4 +211,4 @@ return "<b>Not Applicable</b>"
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
new file mode 100644
index 000000000..e0da22c39
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
@@ -0,0 +1,213 @@
+<?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/CassandraTrigger</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>CassandraTrigger</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>CassandraTrigger</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, latest built artifact will be 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>CassandraTrigger</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>Default private repo branch. Change this value to override the global configuration.</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>CassandraTrigger</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>CassandraTrigger</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/CassandraTrigger</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-lms-jobs.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.trigger</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
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
index fa056df08..e921e22d1 100644
--- 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
@@ -28,16 +28,67 @@
<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>
+ <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, latest built image will be deployed.</b></font></description>
+ <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">
@@ -63,7 +114,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -83,4 +134,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</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
index 4ed5b292c..b71b638f5 100644
--- 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
@@ -28,16 +28,67 @@
<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>
+ <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, latest built image will be deployed.</b></font></description>
+ <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>Content</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>Content</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">
@@ -74,7 +125,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -94,4 +145,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/FuntionalTestCases/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/FuntionalTestCases/config.xml
index 1e97feaa5..60006f9f8 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/FuntionalTestCases/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/FuntionalTestCases/config.xml
@@ -1,8 +1,8 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobAction plugin="pipeline-model-definition@1.3.4.1"/>
- <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction plugin="pipeline-model-definition@1.3.4.1">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobAction plugin="pipeline-model-definition@1.3.8"/>
+ <org.jenkinsci.plugins.pipeline.modeldefinition.actions.DeclarativeJobPropertyTrackerAction plugin="pipeline-model-definition@1.3.8">
<jobProperties/>
<triggers/>
<parameters/>
@@ -27,11 +27,13 @@
<artifactNumToKeep>-1</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
<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>
@@ -40,7 +42,7 @@
<configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -50,7 +52,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -62,4 +64,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
index 44631971c..5e532b85d 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
@@ -21,21 +21,21 @@
<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>
+ <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.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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.53">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
@@ -86,7 +86,7 @@ return "<b>Not Applicable</b>"
<script class="org.biouno.unochoice.model.GroovyScript">
<secureScript plugin="script-security@1.53">
<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, latest built artifact will be deployed.</b></font>"""
+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>"
@@ -104,6 +104,57 @@ 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.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>Keycloak</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>Keycloak</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">
@@ -140,7 +191,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -160,4 +211,4 @@ return "<b>Not Applicable</b>"
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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
index 6a9232507..f91b7fbd8 100644
--- 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
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,11 +20,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-186662917593857</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>KeycloakRealm</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-186662921061407</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>KeycloakRealm</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>
@@ -35,7 +92,7 @@
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -45,7 +102,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>keycloak-deployment</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -65,4 +122,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml
index 82ccfbd15..13fdfdfa6 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml
@@ -28,16 +28,67 @@
<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>
+ <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>
<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>
+ <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>Learner</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>Learner</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">
@@ -74,7 +125,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -94,4 +145,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml
index 1dfbb2a98..ed0af2324 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,10 +13,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-186759255678992</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>Logging</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-186759262347032</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>Logging</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>
@@ -27,7 +82,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -37,7 +92,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -57,4 +112,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logstash/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logstash/config.xml
new file mode 100644
index 000000000..40ece3d11
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logstash/config.xml
@@ -0,0 +1,118 @@
+<?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>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-1356725565280572</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>Logstash</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-1356725566558173</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>Logstash</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/deploy/logstash/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 9a870e34b..111fbdb88 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,10 +13,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-186775018293883</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>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-186775024902722</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>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>
@@ -27,7 +82,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -37,7 +92,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -57,4 +112,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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
index 26970f24e..f66552e01 100644
--- 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
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,10 +20,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@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.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>OnboardAPIs</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-117346594984751</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>OnboardAPIs</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>
@@ -34,7 +89,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -44,7 +99,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -64,4 +119,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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
index 13772a78b..564c1fdfe 100644
--- 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,11 +13,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@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.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>OnboardConsumers</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-186788943531283</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>OnboardConsumers</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>
@@ -25,7 +82,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -35,7 +92,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -55,4 +112,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml
index 90e08fdc7..8d28a949d 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -28,16 +28,73 @@
<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>
+ <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, latest built image will be deployed.</b></font></description>
+ <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>Player</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>Player</projectName>
+ <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></description>
+ <defaultValue>false</defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
@@ -64,7 +121,7 @@
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -74,7 +131,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</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/Proxy/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Proxy/config.xml
index 5bfc2f12e..84389ee47 100644
--- 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -21,16 +21,67 @@
<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>
+ <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, latest built image will be deployed.</b></font></description>
+ <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>Proxy</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>Proxy</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">
@@ -57,7 +108,7 @@
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -67,7 +118,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -87,4 +138,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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
index a9d95f0f7..7b3b96d35 100644
--- 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
@@ -28,16 +28,67 @@
<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>
+ <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, latest built image will be deployed.</b></font></description>
+ <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>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.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>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">
@@ -74,7 +125,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -94,4 +145,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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
index b167ae016..3f59f70e3 100644
--- 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description>Deploys Telemetry Logstash Service</description>
<keepDependencies>false</keepDependencies>
@@ -13,10 +13,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <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>
@@ -27,7 +82,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -37,7 +92,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -57,4 +112,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstashDataPipeline/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstashDataPipeline/config.xml
index 602e2eda1..e0c97eb85 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstashDataPipeline/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstashDataPipeline/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description>Deploys Telemetry Logstash Datapipeline Service</description>
<keepDependencies>false</keepDependencies>
@@ -13,11 +13,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-186648049683240</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>TelemetryLogstashDataPipeline</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-186648052870335</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>TelemetryLogstashDataPipeline</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>
@@ -25,7 +82,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -35,7 +92,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -55,4 +112,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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
new file mode 100644
index 000000000..501c8bff7
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml
@@ -0,0 +1,202 @@
+<?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/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-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>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-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>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-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>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.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>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.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: 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>Yarn</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-lms-jobs.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/yarn/Jenkinsfile</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
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 68477b8ac..5be56a4e0 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.7">
+<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.4.1">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.13"/>
+ <registry plugin="docker-commons@1.14"/>
</org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
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 17352bf36..0e536fb0c 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
@@ -28,21 +28,21 @@
<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>
+ <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/Analytics</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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.53">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
@@ -93,7 +93,7 @@ return "<b>Not Applicable</b>"
<script class="org.biouno.unochoice.model.GroovyScript">
<secureScript plugin="script-security@1.53">
<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, latest built artifact will be deployed.</b></font>"""
+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>"
@@ -111,6 +111,57 @@ 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.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>AnalyticsAPI</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-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.53">
+ <script>return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureFallbackScript>
+ </script>
+ <projectName>AnalyticsAPI</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">
@@ -147,7 +198,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -167,4 +218,4 @@ return "<b>Not Applicable</b>"
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml
index bdb453294..ce75cba48 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml
@@ -28,7 +28,7 @@
<parameterDefinitions>
<hudson.model.ChoiceParameterDefinition>
<name>instance_name</name>
- <description><font color=black size=2><b>Choose the instance to fetch logs.</b></font></description>
+ <description><font color=dimgray size=2><b>Choose the instance to fetch logs.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>spark</string>
@@ -40,7 +40,7 @@
</hudson.model.ChoiceParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>action</name>
- <description><font color=black size=2><b>Choose one of the option - Fetch logs or set cronjob.</b></font></description>
+ <description><font color=dimgray size=2><b>Choose one of the option - Fetch logs or set cronjob.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>fetch-logs</string>
@@ -48,6 +48,57 @@
</a>
</choices>
</hudson.model.ChoiceParameterDefinition>
+ <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>AnalyticsFetchLogs</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-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.53">
+ <script>return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureFallbackScript>
+ </script>
+ <projectName>AnalyticsFetchLogs</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">
@@ -70,7 +121,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -89,5 +140,5 @@
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
+ <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsGeoLocationDBSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsGeoLocationDBSetup/config.xml
index 1dfdaca57..d8b388c43 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsGeoLocationDBSetup/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsGeoLocationDBSetup/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,10 +20,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-188130479612620</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>AnalyticsGeoLocationDBSetup</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-188130482273762</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>AnalyticsGeoLocationDBSetup</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>
@@ -34,7 +89,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -44,7 +99,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -63,5 +118,5 @@
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
+ <disabled>false</disabled>
+</flow-definition>
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 d7a72eae8..1303af19c 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
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -28,19 +28,19 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>Consumer_id</name>
- <description><font color=black size=2><b>Mention the consumer ID.</b></font></description>
+ <description><font color=dimgray size=2><b>Mention the consumer ID.</b></font></description>
<defaultValue>id</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>Channel_id</name>
- <description><font color=black size=2><b>Channel ID to map with the Consumer ID.</b></font></description>
+ <description><font color=dimgray size=2><b>Channel ID to map with the Consumer ID.</b></font></description>
<defaultValue>channel_id</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>status</name>
- <description><font color=black size=2><b> 1 - to activate, 0 - to make it inactive</b></font></description>
+ <description><font color=dimgray size=2><b> 1 - to activate, 0 - to make it inactive</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>1</string>
@@ -50,10 +50,61 @@
</hudson.model.ChoiceParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>Created_by</name>
- <description><font color=black size=2><b>Created by.</b></font></description>
+ <description><font color=dimgray size=2><b>Created by.</b></font></description>
<defaultValue>analytics-team</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.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>AnalyticsPopulatePSQLConsumerChannelMapping</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.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>AnalyticsPopulatePSQLConsumerChannelMapping</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">
@@ -64,9 +115,10 @@
<throttleOption>project</throttleOption>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
+ <configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -76,7 +128,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -95,5 +147,5 @@
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
+ <disabled>false</disabled>
+</flow-definition>
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 5118f0100..b497a6b76 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
@@ -28,13 +28,13 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>cql_query</name>
- <description><font color=black size=2><b>Specify cql_query if any tables needs to be truncated.<b></font></description>
+ <description><font color=dimgray size=2><b>Specify cql_query if any tables needs to be truncated.<b></font></description>
<defaultValue>0</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>job_type</name>
- <description><font color=black size=2><b>Specify the job type - Replay or Run.</b></font></description>
+ <description><font color=dimgray size=2><b>Specify the job type - Replay or Run.</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>replay-job</string>
@@ -46,28 +46,79 @@
</hudson.model.ChoiceParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>job_id</name>
- <description><font color=black size=2><b>Specify the job id.</b></font></description>
+ <description><font color=dimgray size=2><b>Specify the job id.</b></font></description>
<defaultValue></defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>start_date</name>
- <description><font color=black size=2><b>Specify the start date. The default value is just a placeholder which can be changed as per need.</b></font></description>
+ <description><font color=dimgray size=2><b>Specify the start date. The default value is just a placeholder which can be changed as per need.</b></font></description>
<defaultValue>2017-05-01</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>end_date</name>
- <description><font color=black size=2><b>Specify the end date. The default value is just a placeholder which can be changed as per need.</b></font></description>
+ <description><font color=dimgray size=2><b>Specify the end date. The default value is just a placeholder which can be changed as per need.</b></font></description>
<defaultValue>2017-07-11</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>pause_min</name>
- <description><font color=black size=2><b>Specify the # of minutes to pause. The default value is just a placeholder which can be changed as per need.</b></font></description>
+ <description><font color=dimgray size=2><b>Specify the # of minutes to pause. The default value is just a placeholder which can be changed as per need.</b></font></description>
<defaultValue>30</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>AnalyticsReplayJobs</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-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.53">
+ <script>return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureFallbackScript>
+ </script>
+ <projectName>AnalyticsReplayJobs</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">
@@ -90,7 +141,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -109,5 +160,5 @@
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
+ <disabled>false</disabled>
+</flow-definition>
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 18d2b6956..62cacabb9 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
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -28,10 +28,61 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>pause_min</name>
- <description><font color=black size=2><b>Pause for # of minutes.</b></font></description>
+ <description><font color=dimgray size=2><b>Pause for # of minutes.</b></font></description>
<defaultValue>5</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.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>AnalyticsStartJobManager</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.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>AnalyticsStartJobManager</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">
@@ -42,9 +93,10 @@
<throttleOption>project</throttleOption>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
+ <configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -54,7 +106,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -73,5 +125,5 @@
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
+ <disabled>false</disabled>
+</flow-definition>
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 4bc26f549..639011b4c 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
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -32,6 +32,57 @@
<defaultValue>5</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.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>AnalyticsSubmitJobs</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.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>AnalyticsSubmitJobs</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">
@@ -43,7 +94,7 @@
<configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -53,7 +104,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -72,5 +123,5 @@
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
+ <disabled>false</disabled>
+</flow-definition>
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 18e57478a..df883dd1d 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,10 +20,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-188134496458577</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>CassandraDbUpdate</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-188134511232202</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>CassandraDbUpdate</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>
@@ -34,7 +89,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -44,7 +99,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -64,4 +119,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 8555c74ae..4dbe92287 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -28,25 +28,25 @@
<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>
+ <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/Analytics</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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.53">
+ <secureScript plugin="script-security@1.58">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -64,7 +64,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<randomName>choice-parameter-9061670571657</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("JenkinsJob")) {
return """<input name="value" value="lastSuccessfulBuild" class="setting-input" type="text"><br> <font color=darkgreen size=2><b>OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.</b></font>"""
}
@@ -74,7 +74,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -91,16 +91,16 @@ return "<b>Not Applicable</b>"
<randomName>choice-parameter-9061673103864</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("ArtifactRepo")) {
-return """<input name="value" value="" class="setting-input" type="text"> <br> <font color=red size=2><b>CAUTION: If the value is blank, latest built artifact will be deployed.</b></font>"""
+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.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -111,6 +111,57 @@ 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.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>DataProducts</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-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.58">
+ <script>return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureFallbackScript>
+ </script>
+ <projectName>DataProducts</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">
@@ -137,7 +188,7 @@ return "<b>Not Applicable</b>"
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -147,7 +198,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -167,4 +218,4 @@ return "<b>Not Applicable</b>"
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 9e446e5f2..d60816f21 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,10 +20,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-188153004575082</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>KafkaIndexer</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-188153015326365</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>KafkaIndexer</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>
@@ -34,7 +89,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -44,7 +99,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -64,4 +119,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 daa463c46..fd771c74a 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,10 +20,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-188157054642539</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>KafkaSetup</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-188157057910170</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>KafkaSetup</projectName>
+ <parameters class="linked-hash-map"/>
+ <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.1">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
@@ -34,7 +89,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -44,7 +99,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -64,4 +119,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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
new file mode 100644
index 000000000..4ad0e0eae
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -0,0 +1,97 @@
+<?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>-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.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>${public_repo_branch}</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
index c17fd285d..dcfdb361b 100644
--- 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,10 +13,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <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>
@@ -30,7 +85,7 @@
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec></spec>
- <upstreamProjects>../Core/Monitoring</upstreamProjects>
+ <upstreamProjects></upstreamProjects>
<threshold>
<name>FAILURE</name>
<ordinal>2</ordinal>
@@ -41,7 +96,7 @@
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -51,7 +106,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -71,4 +126,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 0aca8d3e7..fa3c7e238 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
@@ -28,10 +28,61 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>schema_repo_version</name>
- <description><font color=black size=2><b>Specify the scehma repo version.</b></font></description>
- <defaultValue>${public_repo_branch}</defaultValue>
+ <description><font color=dimgray size=2><b>Specify the scehma repo version.</b></font></description>
+ <defaultValue>${branch_or_tag}</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>SamzaTelemetrySchemas</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-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.53">
+ <script>return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureFallbackScript>
+ </script>
+ <projectName>SamzaTelemetrySchemas</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">
@@ -54,7 +105,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -74,4 +125,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 c6280e146..3287cf7e1 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -28,25 +28,25 @@
<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>
+ <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.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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.53">
+ <secureScript plugin="script-security@1.58">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -64,7 +64,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<randomName>choice-parameter-9061670571657</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("JenkinsJob")) {
return """<input name="value" value="lastSuccessfulBuild" class="setting-input" type="text"><br> <font color=darkgreen size=2><b>OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.</b></font>"""
}
@@ -74,7 +74,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -91,16 +91,16 @@ return "<b>Not Applicable</b>"
<randomName>choice-parameter-9061673103864</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("ArtifactRepo")) {
-return """<input name="value" value="" class="setting-input" type="text"> <br> <font color=red size=2><b>CAUTION: If the value is blank, latest built artifact will be deployed.</b></font>"""
+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.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -111,6 +111,57 @@ 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.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>Secor</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-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.58">
+ <script>return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureFallbackScript>
+ </script>
+ <projectName>Secor</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">
@@ -137,7 +188,7 @@ return "<b>Not Applicable</b>"
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -147,7 +198,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -167,4 +218,4 @@ return "<b>Not Applicable</b>"
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 5b03ff4cb..ba4495c42 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
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -28,25 +28,25 @@
<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>
+ <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/DataPipeline</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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.53">
+ <secureScript plugin="script-security@1.58">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -64,7 +64,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<randomName>choice-parameter-9061670571657</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("JenkinsJob")) {
return """<input name="value" value="lastSuccessfulBuild" class="setting-input" type="text"><br> <font color=darkgreen size=2><b>OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.</b></font>"""
}
@@ -74,7 +74,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -91,16 +91,16 @@ return "<b>Not Applicable</b>"
<randomName>choice-parameter-9061673103864</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("ArtifactRepo")) {
-return """<input name="value" value="" class="setting-input" type="text"> <br> <font color=red size=2><b>CAUTION: If the value is blank, latest built artifact will be deployed.</b></font>"""
+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.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -111,6 +111,57 @@ 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.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>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.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-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.58">
+ <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>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
@@ -137,7 +188,7 @@ return "<b>Not Applicable</b>"
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -147,7 +198,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -167,4 +218,4 @@ return "<b>Not Applicable</b>"
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/AssetSizeMigration/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/AssetSizeMigration/config.xml
new file mode 100644
index 000000000..f609599a8
--- /dev/null
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/AssetSizeMigration/config.xml
@@ -0,0 +1,210 @@
+<?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>-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/KnowledgePlatform/KnowledgePlatform</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-12566219493457</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>AssetSizeMigration</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-12566221440336</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>AssetSizeMigration</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-12566223395914</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>AssetSizeMigration</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>AssetSizeMigration</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-learning-platform">project-sunbird/sunbird-learning-platform</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>AssetSizeMigration</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-learning-platform.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/asset-size-migration/Jenkinsfile</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
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 5109183f5..300590a6f 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
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,10 +20,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-188160224505093</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>CassandraDbUpdate</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-188160228215280</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-learning-platform">project-sunbird/sunbird-learning-platform</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>CassandraDbUpdate</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>
@@ -37,7 +92,7 @@
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -47,7 +102,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -67,4 +122,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ContentTool/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ContentTool/config.xml
index d4b296559..a07c4a404 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ContentTool/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ContentTool/config.xml
@@ -28,22 +28,73 @@
<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>
+ <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/KnowledgePlatform/KnowledgePlatform</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>command</name>
- <description><font color=black size=2><b>Enter the command.</b></font></description>
+ <description><font color=dimgray size=2><b>Enter the command.</b></font></description>
<defaultValue>sync</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>parameters</name>
- <description><font color=black size=2><b>Enter the do id.</b></font></description>
+ <description><font color=dimgray size=2><b>Enter the do id.</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>ContentTool</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-learning-platform">project-sunbird/sunbird-learning-platform</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>ContentTool</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">
@@ -69,7 +120,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -89,4 +140,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FileSyncTool/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FileSyncTool/config.xml
index 5c730b938..1a51b321a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FileSyncTool/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FileSyncTool/config.xml
@@ -28,16 +28,67 @@
<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>
+ <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/KnowledgePlatform/Synctool</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>filename</name>
- <description><font color=black size=2><b>Enter valid filename with extention.</b></font></description>
+ <description><font color=dimgray size=2><b>Enter valid filename with extention.</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>FileSyncTool</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-learning-platform">project-sunbird/sunbird-learning-platform</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>FileSyncTool</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">
@@ -60,7 +111,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -80,4 +131,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 9271927d8..9890fc895 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,10 +20,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-188161640748171</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>KafkaSetup</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-188161652021198</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-learning-platform">project-sunbird/sunbird-learning-platform</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>KafkaSetup</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>
@@ -37,7 +92,7 @@
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -47,7 +102,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -67,4 +122,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 1bb8dee30..15ef082d9 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
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -28,25 +28,25 @@
<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>
+ <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/KnowledgePlatform/KnowledgePlatform</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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-12566219493457</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -64,7 +64,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<randomName>choice-parameter-12566221440336</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("JenkinsJob")) {
return """<input name="value" value="lastSuccessfulBuild" class="setting-input" type="text"><br> <font color=darkgreen size=2><b>OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.</b></font>"""
}
@@ -74,7 +74,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -91,16 +91,16 @@ return "<b>Not Applicable</b>"
<randomName>choice-parameter-12566223395914</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("ArtifactRepo")) {
-return """<input name="value" value="" class="setting-input" type="text"> <br> <font color=red size=2><b>CAUTION: If the value is blank, latest built artifact will be deployed.</b></font>"""
+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.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -111,6 +111,57 @@ 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.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>Learning</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Learning</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">
@@ -137,7 +188,7 @@ return "<b>Not Applicable</b>"
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -147,7 +198,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -167,4 +218,4 @@ return "<b>Not Applicable</b>"
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml
index 7ddf1d3e3..a12d3f078 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,11 +13,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-188192452200864</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-188192454133057</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-learning-platform">project-sunbird/sunbird-learning-platform</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>
@@ -28,7 +85,7 @@
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec></spec>
- <upstreamProjects>../DataPipeline/Monitoring</upstreamProjects>
+ <upstreamProjects></upstreamProjects>
<threshold>
<name>FAILURE</name>
<ordinal>2</ordinal>
@@ -39,7 +96,7 @@
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -49,7 +106,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -69,4 +126,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 25b009260..1e2a79973 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
@@ -28,21 +28,21 @@
<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>
+ <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/KnowledgePlatform/Neo4j</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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.53">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
@@ -93,7 +93,7 @@ return "<b>Not Applicable</b>"
<script class="org.biouno.unochoice.model.GroovyScript">
<secureScript plugin="script-security@1.53">
<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, latest built artifact will be deployed.</b></font>"""
+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>"
@@ -111,6 +111,57 @@ 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.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>Neo4j</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Neo4j</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">
@@ -136,7 +187,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -156,4 +207,4 @@ return "<b>Not Applicable</b>"
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 8eaf214cc..92bd78aae 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,11 +20,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-188174424977419</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>Neo4jDefinitionUpdate</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-188174429374717</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Neo4jDefinitionUpdate</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>
@@ -35,7 +92,7 @@
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -45,7 +102,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -65,4 +122,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 277ab59d9..dcbed687f 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
@@ -28,21 +28,21 @@
<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>
+ <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/KnowledgePlatform/SyncTool</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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-14175006770414</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
<secureScript plugin="script-security@1.53">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
@@ -93,7 +93,7 @@ return "<b>Not Applicable</b>"
<script class="org.biouno.unochoice.model.GroovyScript">
<secureScript plugin="script-security@1.53">
<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, latest built artifact will be deployed.</b></font>"""
+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>"
@@ -113,7 +113,7 @@ return "<b>Not Applicable</b>"
</org.biouno.unochoice.DynamicReferenceParameter>
<hudson.model.ChoiceParameterDefinition>
<name>command</name>
- <description><font color=black size=2><b>Select a command</b></font></description>
+ <description><font color=dimgray size=2><b>Select a command</b></font></description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>sync</string>
@@ -125,7 +125,7 @@ return "<b>Not Applicable</b>"
</hudson.model.ChoiceParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>parameters</name>
- <description><font color=black size=2><b>It is parameter to pass with command.<br>
+ <description><font color=dimgray size=2><b>It is parameter to pass with command.<br>
ex:<br>
--objectType Content<br>
--ids do_10101010,do_20202020<br>
@@ -136,6 +136,57 @@ return "<b>Not Applicable</b>"
<defaultValue>--graph domain</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>Neo4jElasticSearchSyncTool</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Neo4jElasticSearchSyncTool</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">
@@ -161,7 +212,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -181,4 +232,4 @@ return "<b>Not Applicable</b>"
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 d1ef2ccb9..d2631728a 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
@@ -28,21 +28,21 @@
<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>
+ <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/KnowledgePlatform/KnowledgePlatform</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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.53">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
@@ -93,7 +93,7 @@ return "<b>Not Applicable</b>"
<script class="org.biouno.unochoice.model.GroovyScript">
<secureScript plugin="script-security@1.53">
<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, latest built artifact will be deployed.</b></font>"""
+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>"
@@ -111,6 +111,57 @@ 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.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>Search</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Search</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">
@@ -147,7 +198,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -167,4 +218,4 @@ return "<b>Not Applicable</b>"
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StartNeo4jCluster/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StartNeo4jCluster/config.xml
index 9385b056f..a74732892 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StartNeo4jCluster/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StartNeo4jCluster/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,10 +20,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-188176807343905</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>StartNeo4jCluster</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-188176809967474</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-learning-platform">project-sunbird/sunbird-learning-platform</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>StartNeo4jCluster</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>
@@ -37,7 +92,7 @@
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -47,7 +102,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -67,4 +122,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StopNeo4jCluster/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StopNeo4jCluster/config.xml
index fadcb50b6..171131550 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StopNeo4jCluster/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StopNeo4jCluster/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,10 +20,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-188179225214575</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>StopNeo4jCluster</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-188179228400193</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-learning-platform">project-sunbird/sunbird-learning-platform</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>StopNeo4jCluster</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>
@@ -37,7 +92,7 @@
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -47,7 +102,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -67,4 +122,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ValidateLearning/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ValidateLearning/config.xml
index 599982859..70cf30e77 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ValidateLearning/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ValidateLearning/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,11 +20,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-188181907964621</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>ValidateLearning</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-188181915988837</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-learning-platform">project-sunbird/sunbird-learning-platform</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>ValidateLearning</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>
@@ -35,7 +92,7 @@
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -45,7 +102,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -65,4 +122,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 880c93ef5..709d47b66 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -28,25 +28,25 @@
<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>
+ <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/KnowledgePlatform/Yarn</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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.53">
+ <secureScript plugin="script-security@1.58">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -64,7 +64,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<randomName>choice-parameter-2874449088885218</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("JenkinsJob")) {
return """<input name="value" value="lastSuccessfulBuild" class="setting-input" type="text"><br> <font color=darkgreen size=2><b>OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.</b></font>"""
}
@@ -74,7 +74,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -91,16 +91,16 @@ return "<b>Not Applicable</b>"
<randomName>choice-parameter-2877900313772031</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("ArtifactRepo")) {
-return """<input name="value" value="" class="setting-input" type="text"> <br> <font color=red size=2><b>CAUTION: If the value is blank, latest built artifact will be deployed.</b></font>"""
+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.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -111,6 +111,57 @@ 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.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>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.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>
+ <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>Yarn</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">
@@ -137,7 +188,7 @@ return "<b>Not Applicable</b>"
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -147,7 +198,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -167,4 +218,4 @@ return "<b>Not Applicable</b>"
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/config.xml
index 68477b8ac..5be56a4e0 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/config.xml
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
+<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.4.1">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.13"/>
+ <registry plugin="docker-commons@1.14"/>
</org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
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 e097c5284..9550a52ea 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
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -13,31 +13,25 @@
<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>
+ <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/CollectionEditor</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>container_name</name>
- <description><font color=black size=2><b>Please specify azure container name.</b></font></description>
- <defaultValue>plugins</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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.53">
+ <secureScript plugin="script-security@1.58">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -55,7 +49,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<randomName>choice-parameter-620062286335119</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("JenkinsJob")) {
return """<input name="value" value="lastSuccessfulBuild" class="setting-input" type="text"><br> <font color=darkgreen size=2><b>OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.</b></font>"""
}
@@ -65,7 +59,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -82,16 +76,16 @@ return "<b>Not Applicable</b>"
<randomName>choice-parameter-620062288387509</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("ArtifactRepo")) {
-return """<input name="value" value="" class="setting-input" type="text"> <br> <font color=red size=2><b>CAUTION: If the value is blank, latest built artifact will be deployed.</b></font>"""
+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.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -102,6 +96,56 @@ 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.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>CollectionEditor</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: 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>CollectionEditor</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">
@@ -128,7 +172,7 @@ return "<b>Not Applicable</b>"
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -138,7 +182,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</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/ContentFramework/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
similarity index 58%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentFramework/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
index 6103ba644..f2e12695a 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentFramework/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -13,36 +13,30 @@
<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/Plugins/ContentFramework</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>container_name</name>
- <description><font color=black size=2><b>Please specify azure container name.</b></font></description>
- <defaultValue>plugins</defaultValue>
+ <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/ContentEditor</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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.53">
+ <secureScript plugin="script-security@1.58">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentFramework</projectName>
+ <projectName>ContentEditor</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters></referencedParameters>
<choiceType>PT_SINGLE_SELECT</choiceType>
@@ -55,7 +49,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<randomName>choice-parameter-620062286335119</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("JenkinsJob")) {
return """<input name="value" value="lastSuccessfulBuild" class="setting-input" type="text"><br> <font color=darkgreen size=2><b>OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.</b></font>"""
}
@@ -65,12 +59,12 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentFramework</projectName>
+ <projectName>ContentEditor</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters>artifact_source</referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -82,26 +76,76 @@ return "<b>Not Applicable</b>"
<randomName>choice-parameter-620062288387509</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("ArtifactRepo")) {
-return """<input name="value" value="" class="setting-input" type="text"> <br> <font color=red size=2><b>CAUTION: If the value is blank, latest built artifact will be deployed.</b></font>"""
+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.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentFramework</projectName>
+ <projectName>ContentEditor</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>ContentEditor</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: 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>ContentEditor</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">
@@ -117,7 +161,7 @@ return "<b>Not Applicable</b>"
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Plugins/ContentFramework</upstreamProjects>
+ <upstreamProjects>ArtifactUpload/dev/Plugins/ContentEditor</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -128,7 +172,7 @@ return "<b>Not Applicable</b>"
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -138,7 +182,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</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/ContentRendererPreview/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
similarity index 58%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentRendererPreview/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
index d25ae6458..ac0f00835 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentRendererPreview/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -13,36 +13,30 @@
<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/Plugins/ContentRendererPreview</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>container_name</name>
- <description><font color=black size=2><b>Please specify azure container name.</b></font></description>
- <defaultValue>plugins</defaultValue>
+ <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/ContentPlayer</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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.53">
+ <secureScript plugin="script-security@1.58">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentRendererPreview</projectName>
+ <projectName>ContentPlayer</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters></referencedParameters>
<choiceType>PT_SINGLE_SELECT</choiceType>
@@ -55,7 +49,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<randomName>choice-parameter-620062286335119</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("JenkinsJob")) {
return """<input name="value" value="lastSuccessfulBuild" class="setting-input" type="text"><br> <font color=darkgreen size=2><b>OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.</b></font>"""
}
@@ -65,12 +59,12 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentRendererPreview</projectName>
+ <projectName>ContentPlayer</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters>artifact_source</referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -82,26 +76,76 @@ return "<b>Not Applicable</b>"
<randomName>choice-parameter-620062288387509</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("ArtifactRepo")) {
-return """<input name="value" value="" class="setting-input" type="text"> <br> <font color=red size=2><b>CAUTION: If the value is blank, latest built artifact will be deployed.</b></font>"""
+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.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentRendererPreview</projectName>
+ <projectName>ContentPlayer</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>ContentPlayer</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: 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>ContentPlayer</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">
@@ -117,7 +161,7 @@ return "<b>Not Applicable</b>"
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Plugins/ContentRendererPreview</upstreamProjects>
+ <upstreamProjects>ArtifactUpload/dev/Plugins/ContentPlayer</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -128,7 +172,7 @@ return "<b>Not Applicable</b>"
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -138,7 +182,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</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/CEPlugins/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
similarity index 58%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CEPlugins/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
index 53ae131d1..5e13a75c6 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CEPlugins/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -13,36 +13,30 @@
<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/Plugins/CEPlugins</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>container_name</name>
- <description><font color=black size=2><b>Please specify azure container name.</b></font></description>
- <defaultValue>plugins</defaultValue>
+ <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=black size=2><b>
+ <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.53">
+ <secureScript plugin="script-security@1.58">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>CEPlugins</projectName>
+ <projectName>ContentPlugins</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters></referencedParameters>
<choiceType>PT_SINGLE_SELECT</choiceType>
@@ -55,7 +49,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<randomName>choice-parameter-620062286335119</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("JenkinsJob")) {
return """<input name="value" value="lastSuccessfulBuild" class="setting-input" type="text"><br> <font color=darkgreen size=2><b>OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.</b></font>"""
}
@@ -65,12 +59,12 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>CEPlugins</projectName>
+ <projectName>ContentPlugins</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters>artifact_source</referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -82,26 +76,76 @@ return "<b>Not Applicable</b>"
<randomName>choice-parameter-620062288387509</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("ArtifactRepo")) {
-return """<input name="value" value="" class="setting-input" type="text"> <br> <font color=red size=2><b>CAUTION: If the value is blank, latest built artifact will be deployed.</b></font>"""
+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.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>CEPlugins</projectName>
+ <projectName>ContentPlugins</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>ContentPlugins</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: 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>ContentPlugins</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">
@@ -117,7 +161,7 @@ return "<b>Not Applicable</b>"
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Plugins/CEPlugins</upstreamProjects>
+ <upstreamProjects>ArtifactUpload/dev/Plugins/ContentPlugins</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -128,7 +172,7 @@ return "<b>Not Applicable</b>"
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -138,7 +182,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</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/GenericEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/GenericEditor/config.xml
index 2fc9a8360..9f46a06ef 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
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -13,31 +13,25 @@
<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>
+ <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/GenericEditor</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
- <hudson.model.StringParameterDefinition>
- <name>container_name</name>
- <description><font color=black size=2><b>Please specify azure container name.</b></font></description>
- <defaultValue>plugins</defaultValue>
- <trim>false</trim>
- </hudson.model.StringParameterDefinition>
<org.biouno.unochoice.CascadeChoiceParameter plugin="uno-choice@2.1">
<name>artifact_source</name>
- <description><font color=black size=2><b>
+ <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.53">
+ <secureScript plugin="script-security@1.58">
<script>return[
-'ArtifactRepo',
-'JenkinsJob'
+'JenkinsJob',
+'ArtifactRepo'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -55,7 +49,7 @@ ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrif
<randomName>choice-parameter-620062286335119</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("JenkinsJob")) {
return """<input name="value" value="lastSuccessfulBuild" class="setting-input" type="text"><br> <font color=darkgreen size=2><b>OPTIONAL: Specify the build number of ArtifactUpload job from which the artifact will be copied and deployed.</b></font>"""
}
@@ -65,7 +59,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -82,16 +76,16 @@ return "<b>Not Applicable</b>"
<randomName>choice-parameter-620062288387509</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.53">
+ <secureScript plugin="script-security@1.58">
<script>if (artifact_source.equals("ArtifactRepo")) {
-return """<input name="value" value="" class="setting-input" type="text"> <br> <font color=red size=2><b>CAUTION: If the value is blank, latest built artifact will be deployed.</b></font>"""
+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.53">
+ <secureFallbackScript plugin="script-security@1.58">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -102,6 +96,56 @@ 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.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>GenericEditor</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: 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>GenericEditor</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">
@@ -128,7 +172,7 @@ return "<b>Not Applicable</b>"
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -138,7 +182,7 @@ return "<b>Not Applicable</b>"
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</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/ApplicationElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ApplicationElasticsearchBackup/config.xml
index ff31ba71a..0b6afa894 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,84 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-189747244589805</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>ApplicationElasticsearchBackup</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-189747247305087</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>ApplicationElasticsearchBackup</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>
+ <hudson.triggers.TimerTrigger>
+ <spec>30 2 * * *</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -28,7 +99,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -38,6 +109,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
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 71f6ef2c8..e1d3226eb 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-189745871212329</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>ApplicationElasticsearchRestore</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-189745873861032</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>ApplicationElasticsearchRestore</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -28,7 +90,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -38,6 +100,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
index 8e9ca19f1..9b168d96d 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -32,9 +32,62 @@
<defaultValue>core</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-189744593687191</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>Bootstrap</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-189744596707715</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>Bootstrap</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>
@@ -42,7 +95,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -52,7 +105,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -72,4 +125,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 7bbf214a5..91b4ac4ab 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,84 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-189743214208409</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>CassandraBackup</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-189743216959018</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>CassandraBackup</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>
+ <hudson.triggers.TimerTrigger>
+ <spec>30 3 * * *</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -28,7 +99,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -38,6 +109,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -47,4 +119,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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
new file mode 100644
index 000000000..249c04df0
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml
@@ -0,0 +1,140 @@
+<?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.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <hudson.model.StringParameterDefinition>
+ <name>instance_name</name>
+ <description><font color=dimgray size=2><b>Enter ansible group name</b></font></description>
+ <defaultValue></defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>username</name>
+ <description><font color=dimgray size=2><b>Enter user name</b></font></description>
+ <defaultValue></defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>password</name>
+ <description><font color=dimgray size=2><b>Enter encrypted password</b></font></description>
+ <defaultValue></defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>public_key</name>
+ <description><font color=dimgray size=2><b>Enter public key in single quotes</b></font></description>
+ <defaultValue></defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.ChoiceParameterDefinition>
+ <name>tag</name>
+ <description></description>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>add-user</string>
+ <string>delete-user</string>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-189741599993386</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>CreateUser</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-189741602917876</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>CreateUser</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/ops/createuser/Jenkinsfile</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggerElasticSearch/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml
similarity index 87%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggerElasticSearch/config.xml
rename to deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml
index d1cee1407..3737001e7 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggerElasticSearch/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml
@@ -26,6 +26,9 @@
<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">
@@ -37,7 +40,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -47,14 +50,14 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>1</depth>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
</scm>
- <scriptPath>pipelines/deploy/logger-elasticsearch/Jenkinsfile</scriptPath>
+ <scriptPath>pipelines/esmapping/Jenkinsfile</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/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
new file mode 100644
index 000000000..9f5638db9
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
@@ -0,0 +1,117 @@
+<?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>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-189743214208409</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>GrafanaBackup</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-189743216959018</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: 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>GrafanaBackup</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/backup/grafana-backup/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/KeyRotation/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/KeyRotation/config.xml
index b42a47c73..1880fa9db 100644
--- 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -21,34 +21,85 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>bootstrap_user</name>
- <description>deployer user</description>
+ <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>Deployer user public key keep in single quotes</description>
+ <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>ops user</description>
+ <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>location of ssh key for ops user from '/'</description>
+ <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>ops public key</description>
+ <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">
@@ -61,7 +112,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -71,7 +122,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -91,4 +142,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 1b2680943..c7d211319 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,84 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-189736181593455</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>LoggerElasticSearchBackup</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-189736184660192</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>LoggerElasticSearchBackup</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>
+ <hudson.triggers.TimerTrigger>
+ <spec>30 1 * * *</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -28,7 +99,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -38,6 +109,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -47,4 +119,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchRestore/config.xml
index 155b4a90a..53aa24f43 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchRestore/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-189735035014631</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>LoggerElasticSearchRestore</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-189735038967629</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>LoggerElasticSearchRestore</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -28,7 +90,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -38,6 +100,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -47,4 +110,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 faa94b00f..ca87b16be 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-189733897665665</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>PostgresqlBackup</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-189733901134743</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>PostgresqlBackup</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.61">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+ <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>
@@ -28,7 +90,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -48,4 +110,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 9ad72ff26..64500d857 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-189732293676046</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>PostgresqlRestore</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-189732297357674</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>PostgresqlRestore</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.61">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+ <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>
@@ -28,7 +90,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -48,4 +110,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 8e757f82b..7db6e451b 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,84 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-189729368328896</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>PrometheusBackup</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-189729371394455</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>PrometheusBackup</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>
+ <hudson.triggers.TimerTrigger>
+ <spec>30 1 * * *</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -28,7 +99,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -38,6 +109,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -47,4 +119,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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
index cec50282a..429a4261f 100644
--- 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -28,7 +90,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -38,6 +100,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -47,4 +110,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/config.xml
index 68477b8ac..e5b5ea47c 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/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.7">
+<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.4.1">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.7">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.13"/>
+ <registry plugin="docker-commons@1.14"/>
</org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
@@ -26,4 +26,4 @@
</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
+</com.cloudbees.hudson.plugins.folder.Folder>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPILogs/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPILogs/config.xml
deleted file mode 100644
index c89f254ee..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPILogs/config.xml
+++ /dev/null
@@ -1,51 +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>-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.29">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- </properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.61">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
- <configVersion>2</configVersion>
- <userRemoteConfigs>
- <hudson.plugins.git.UserRemoteConfig>
- <url>https://github.com/ekstep/sunbird-devops.git</url>
- <credentialsId>64bdfe13-cc30-4864-bd3c-4e89be89fc9d</credentialsId>
- </hudson.plugins.git.UserRemoteConfig>
- </userRemoteConfigs>
- <branches>
- <hudson.plugins.git.BranchSpec>
- <name>DO-380</name>
- </hudson.plugins.git.BranchSpec>
- </branches>
- <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
- <submoduleCfg class="list"/>
- <extensions/>
- </scm>
- <scriptPath>pipelines/analytics-api-logs/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/DataPipeline/jobs/Bootstrap/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Bootstrap/config.xml
index df91bff4c..7b842f76d 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Bootstrap/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/Bootstrap/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -25,11 +25,69 @@
<defaultValue>dp</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-193680915486807</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>Bootstrap</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-193680923405976</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>Bootstrap</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -38,7 +96,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -48,6 +106,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -57,4 +116,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</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 8b27f18cb..ddf95258d 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
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -38,17 +38,77 @@
<defaultValue>/var/lib/cassandra/data</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-193681861366171</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>CassandraBackup</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-193681863393052</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>CassandraBackup</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>
+ <hudson.triggers.TimerTrigger>
+ <spec>30 5 * * *</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.63">
+ <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>
@@ -58,7 +118,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -78,4 +138,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 b4c7ea72a..adc5e79cc 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
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -38,11 +38,69 @@
<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-193682805945533</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>CassandraRestore</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-193682809902019</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>CassandraRestore</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.61">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+ <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>
@@ -51,7 +109,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -71,4 +129,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CreateUser/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CreateUser/config.xml
new file mode 100644
index 000000000..933f47e1e
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CreateUser/config.xml
@@ -0,0 +1,140 @@
+<?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.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <hudson.model.StringParameterDefinition>
+ <name>instance_name</name>
+ <description><font color=dimgray size=2><b>Enter ansible group name</b></font></description>
+ <defaultValue></defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>username</name>
+ <description><font color=dimgray size=2><b>Enter user name</b></font></description>
+ <defaultValue></defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>password</name>
+ <description><font color=dimgray size=2><b>Enter encrypted password</b></font></description>
+ <defaultValue></defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>public_key</name>
+ <description><font color=dimgray size=2><b>Enter public key in single quotes</b></font></description>
+ <defaultValue></defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.ChoiceParameterDefinition>
+ <name>tag</name>
+ <description></description>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>add-user</string>
+ <string>delete-user</string>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-193683662067116</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>CreateUser</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-193683665760402</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>CreateUser</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/ops/createuser/Jenkinsfile</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CustomMonitoring/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CustomMonitoring/config.xml
new file mode 100644
index 000000000..058ef3913
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CustomMonitoring/config.xml
@@ -0,0 +1,140 @@
+<?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>-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.ChoiceParameterDefinition>
+ <name>tags</name>
+ <description>[ backup : This tag is to copy the samza container log upload script to yarn slaves ]
+
+[ samza : This tag is to copy the samza jobs failure alert script to yarn master ]
+
+[ throughput : This tag is to copy the throughput alert script to influxdb ]
+
+[ dataproduct : This tag is to copy the dataproduct job failure alert script to influxdb ]</description>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>backup</string>
+ <string>samza</string>
+ <string>throughput</string>
+ <string>dataproduct</string>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-1439563480463029</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>CustomMonitoring</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-1439563481736931</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-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.58">
+ <script>return """<b>This parameter is not used</b>"""</script>
+ <sandbox>false</sandbox>
+ </secureFallbackScript>
+ </script>
+ <projectName>CustomMonitoring</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/kaali09/sunbird-data-pipeline.git</url>
+ </hudson.plugins.git.UserRemoteConfig>
+ </userRemoteConfigs>
+ <branches>
+ <hudson.plugins.git.BranchSpec>
+ <name>release-2.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/provision/yarn/Jenkinsfile.monitoring</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/DataPipeline/jobs/ElasticsearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/ElasticsearchBackup/config.xml
index 3f1226986..0205cb8e3 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
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -32,17 +32,77 @@
<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-193684482193674</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>ElasticsearchBackup</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-193684493817846</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>ElasticsearchBackup</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>
+ <hudson.triggers.TimerTrigger>
+ <spec>H 2 * * *</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.63">
+ <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>
@@ -52,7 +112,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -72,4 +132,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 311d76650..bfa6996b0 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
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,7 +20,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -40,11 +40,69 @@ curl http://localhost:9200/_snapshot/azurebackup/_all, Parse the json and get th
<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-193685371526717</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>ElasticsearchRestore</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-193685378659458</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>ElasticsearchRestore</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -53,7 +111,7 @@ curl http://localhost:9200/_snapshot/azurebackup/_all, Parse the json and get th
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -63,6 +121,7 @@ curl http://localhost:9200/_snapshot/azurebackup/_all, Parse the json and get th
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -72,4 +131,4 @@ curl http://localhost:9200/_snapshot/azurebackup/_all, Parse the json and get th
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 7723d1b63..f83da39bf 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
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,19 +20,83 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-193686205164304</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>InfluxDBBackup</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-193686227117959</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>InfluxDBBackup</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>
+ <hudson.triggers.TimerTrigger>
+ <spec>0 0 * * *</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.63">
+ <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>
@@ -42,7 +106,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -62,4 +126,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/KeyRotation/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/KeyRotation/config.xml
new file mode 100644
index 000000000..faaea481f
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/KeyRotation/config.xml
@@ -0,0 +1,145 @@
+<?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>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-193687012897757</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-193687017745852</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>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/DataPipeline/jobs/PostgresqlBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/PostgresqlBackup/config.xml
index 018f24c55..24282ed99 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-193687699799775</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>PostgresqlBackup</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-193687712890752</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>PostgresqlBackup</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -28,7 +90,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -48,4 +110,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 6516c5daf..964df78a2 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-193688569045596</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>PostgresqlRestore</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-193688572421965</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>PostgresqlRestore</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -28,7 +90,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -48,4 +110,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml
new file mode 100644
index 000000000..f378f722f
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml
@@ -0,0 +1,67 @@
+<?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>-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.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-data-pipeline.git</url>
+ </hudson.plugins.git.UserRemoteConfig>
+ </userRemoteConfigs>
+ <branches>
+ <hudson.plugins.git.BranchSpec>
+ <name>${public_repo_branch}</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/samza/Jenkinsfile.provision</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
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
new file mode 100644
index 000000000..65ba441eb
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml
@@ -0,0 +1,85 @@
+<?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>-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.29">
+ <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>
+ <configVersion>1</configVersion>
+ </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+ <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+ <triggers>
+ <jenkins.triggers.ReverseBuildTrigger>
+ <spec></spec>
+ <upstreamProjects>Deploy/dev/DataPipeline/Yarn,Deploy/dev/KnowledgePlatform/Yarn</upstreamProjects>
+ <threshold>
+ <name>SUCCESS</name>
+ <ordinal>0</ordinal>
+ <color>BLUE</color>
+ <completeBuild>true</completeBuild>
+ </threshold>
+ </jenkins.triggers.ReverseBuildTrigger>
+ <hudson.triggers.TimerTrigger>
+ <spec>0 */2 * * *</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.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-data-pipeline.git</url>
+ </hudson.plugins.git.UserRemoteConfig>
+ </userRemoteConfigs>
+ <branches>
+ <hudson.plugins.git.BranchSpec>
+ <name>refs/tags/tag-for-backups</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/samza/Jenkinsfile.Orphanalert</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Bootstrap/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Bootstrap/config.xml
index 0e32e6c07..62b910c1e 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Bootstrap/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Bootstrap/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -12,7 +12,7 @@
<artifactNumToKeep>5</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -24,11 +24,69 @@
<defaultValue>lp</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-193689498769432</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>Bootstrap</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-193689502753641</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Bootstrap</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -37,7 +95,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -57,4 +115,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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 37d9df319..60e4cfa80 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -31,6 +31,57 @@
<defaultValue>/var/lib/cassandra/data</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-193690420291616</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>CassandraBackup</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-193690422104853</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-learning-platform">project-sunbird/sunbird-learning-platform</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>CassandraBackup</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">
@@ -42,8 +93,15 @@
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+ <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+ <triggers>
+ <hudson.triggers.TimerTrigger>
+ <spec>H 1 * * *</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.63">
+ <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>
@@ -53,7 +111,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -73,4 +131,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraRestore/config.xml
index 2e1f614b7..9ef5802d1 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraRestore/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -31,11 +31,69 @@
<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-193691352932058</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>CassandraRestore</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-193691356042243</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-learning-platform">project-sunbird/sunbird-learning-platform</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>CassandraRestore</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.61">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+ <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>
@@ -44,7 +102,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -64,4 +122,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CreateUser/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CreateUser/config.xml
new file mode 100644
index 000000000..97338a182
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CreateUser/config.xml
@@ -0,0 +1,140 @@
+<?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.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <hudson.model.StringParameterDefinition>
+ <name>instance_name</name>
+ <description><font color=dimgray size=2><b>Enter ansible group name</b></font></description>
+ <defaultValue></defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>username</name>
+ <description><font color=dimgray size=2><b>Enter user name</b></font></description>
+ <defaultValue></defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>password</name>
+ <description><font color=dimgray size=2><b>Enter user name</b></font></description>
+ <defaultValue></defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>public_key</name>
+ <description><font color=dimgray size=2><b>Enter public key in single quotes</b></font></description>
+ <defaultValue></defaultValue>
+ <trim>false</trim>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.ChoiceParameterDefinition>
+ <name>tag</name>
+ <description></description>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>add-user</string>
+ <string>delete-user</string>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-193692369324875</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>CreateUser</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-193692374018706</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-learning-platform">project-sunbird/sunbird-learning-platform</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>CreateUser</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/ops/createuser/Jenkinsfile</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
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 dff07e183..2f4001e05 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,10 +13,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-193692901127485</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>ElasticsearchBackup</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-193692904321817</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-learning-platform">project-sunbird/sunbird-learning-platform</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>ElasticsearchBackup</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>
@@ -26,8 +81,15 @@
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+ <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+ <triggers>
+ <hudson.triggers.TimerTrigger>
+ <spec>H 1 * * *</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.63">
+ <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>
@@ -37,16 +99,24 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
- <extensions/>
+ <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/backup/elasticsearch/Jenkinsfile</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/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml
index 76be767bb..24d88e8e2 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -33,11 +33,69 @@ curl http://localhost:9200/_snapshot/azurebackup/_all, Parse the json and get th
<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-193693971284924</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>ElasticsearchRestore</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-193693974507874</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-learning-platform">project-sunbird/sunbird-learning-platform</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>ElasticsearchRestore</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.61">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+ <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>
@@ -46,16 +104,24 @@ curl http://localhost:9200/_snapshot/azurebackup/_all, Parse the json and get th
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
- <extensions/>
+ <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/backup/elasticsearch-restore/Jenkinsfile</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/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml
new file mode 100644
index 000000000..70003b8d7
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml
@@ -0,0 +1,145 @@
+<?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>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-193694766371480</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-193694770443996</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-learning-platform">project-sunbird/sunbird-learning-platform</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/KnowledgePlatform/jobs/Neo4jBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jBackup/config.xml
index 6822d1ba5..1b83d545d 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
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,10 +13,65 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-193695591871973</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>Neo4jBackup</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-193695594771667</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Neo4jBackup</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>
@@ -26,8 +81,15 @@
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+ <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+ <triggers>
+ <hudson.triggers.TimerTrigger>
+ <spec>H 2 * * *</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.63">
+ <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>
@@ -37,7 +99,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -57,4 +119,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jRestore/config.xml
index a8fada98d..8f35aafeb 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jRestore/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jRestore/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,7 +13,7 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -31,9 +31,62 @@
<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-193696475907326</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>Neo4jRestore</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-193696489739689</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Neo4jRestore</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>
@@ -41,7 +94,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -51,7 +104,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>refs/tags/tag-for-backups</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -71,4 +124,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
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
new file mode 100644
index 000000000..35eabbf47
--- /dev/null
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml
@@ -0,0 +1,122 @@
+<?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>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-193697432119747</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>RedisBackup</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-193697441891806</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-learning-platform">project-sunbird/sunbird-learning-platform</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>RedisBackup</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>
+ <hudson.triggers.TimerTrigger>
+ <spec>H 2 * * *</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.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-learning-platform.git</url>
+ </hudson.plugins.git.UserRemoteConfig>
+ </userRemoteConfigs>
+ <branches>
+ <hudson.plugins.git.BranchSpec>
+ <name>refs/tags/tag-for-backups</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/backup/redis-backup/Jenkinsfile</scriptPath>
+ <lightweight>false</lightweight>
+ </definition>
+ <triggers/>
+ <disabled>false</disabled>
+</flow-definition>
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 68477b8ac..e5b5ea47c 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/config.xml
+++ b/deploy/jenkins/jobs/Provision/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.7">
+<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.4.1">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.7">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.13"/>
+ <registry plugin="docker-commons@1.14"/>
</org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
@@ -26,4 +26,4 @@
</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
+</com.cloudbees.hudson.plugins.folder.Folder>
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 ff598501a..d126cd51a 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,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,11 +13,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196486141556745</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>Cassandra</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-196486144020383</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>Cassandra</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>
@@ -25,7 +82,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -35,7 +92,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -55,4 +112,4 @@
</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/JenkinsSlave/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/JenkinsSlave/config.xml
index 4e632379e..de4e7c3c1 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/JenkinsSlave/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/JenkinsSlave/config.xml
@@ -21,7 +21,7 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>jenkins_host</name>
- <description><font color=black size=2><b>Provide the IP of Jenkins host.</b></font></description>
+ <description><font color=dimgray size=2><b>Provide the IP of Jenkins host.</b></font></description>
<defaultValue></defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -67,4 +67,4 @@
</definition>
<triggers/>
<disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Kafka/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Kafka/config.xml
index d78cd9a24..77f8f0b4a 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Kafka/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Kafka/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,11 +13,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196486974912295</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>Kafka</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-196486977688470</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>Kafka</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>
@@ -25,7 +82,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -35,7 +92,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>{public_repo_branch}</name>
+ <name>{branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -54,5 +111,5 @@
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
+ <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
index fcc171f96..69198f5fb 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,11 +13,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <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.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>Keycloak</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.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>Keycloak</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>
@@ -25,7 +82,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -35,7 +92,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -45,14 +102,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
- <honorRefspec>false</honorRefspec>
- </hudson.plugins.git.extensions.impl.CloneOption>
- <hudson.plugins.git.extensions.impl.CloneOption>
- <shallow>true</shallow>
- <noTags>false</noTags>
- <reference></reference>
- <depth>0</depth>
+ <depth>1</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -62,4 +112,4 @@
</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/LogElasticSearch/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogElasticSearch/config.xml
index 31388c031..8833fd8d5 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogElasticSearch/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogElasticSearch/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,76 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196488765575840</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>LogElasticSearch</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-196488769510321</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>LogElasticSearch</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -28,7 +91,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -38,6 +101,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -47,4 +111,4 @@
</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/Logstash/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Logstash/config.xml
new file mode 100644
index 000000000..95778c7d7
--- /dev/null
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Logstash/config.xml
@@ -0,0 +1,115 @@
+<?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>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-1356872058540220</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>Logstash</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-1356872059801019</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>Logstash</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>0</depth>
+ <honorRefspec>false</honorRefspec>
+ </hudson.plugins.git.extensions.impl.CloneOption>
+ </extensions>
+ </scm>
+ <scriptPath>pipelines/provision/logstash/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/Core/jobs/Postgres/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Postgres/config.xml
index 3b3747b52..bf512172c 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,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196489635829894</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>Postgres</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-196489639391445</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>Postgres</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -28,7 +90,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -38,6 +100,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -47,4 +110,4 @@
</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 48928e45f..b56709817 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,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,13 +13,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196490490920280</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>PostgresDbUpdate</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-196490493760485</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>PostgresDbUpdate</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -28,7 +90,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -38,6 +100,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -47,4 +110,4 @@
</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/Registry/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Registry/config.xml
index 0d74bd2f9..7a4cd1955 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Registry/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Registry/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,11 +13,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196491343843987</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>Registry</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-196491346584243</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>Registry</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>
@@ -25,7 +82,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -35,7 +92,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -54,5 +111,5 @@
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
+ <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Secor/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Secor/config.xml
index cf7405297..102641d9f 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Secor/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Secor/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,11 +13,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196492081645652</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>Secor</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-196492094618716</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>Secor</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>
@@ -25,7 +82,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -35,7 +92,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -54,5 +111,5 @@
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>true</disabled>
-</flow-definition>
\ No newline at end of file
+ <disabled>false</disabled>
+</flow-definition>
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/config.xml
index 68477b8ac..5be56a4e0 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/config.xml
+++ b/deploy/jenkins/jobs/Provision/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.7">
+<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.4.1">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.13"/>
+ <registry plugin="docker-commons@1.14"/>
</org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
</properties>
<folderViews class="com.cloudbees.hudson.plugins.folder.views.DefaultFolderViewHolder">
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
index daeb780bb..721ce4b62 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPI/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,13 +20,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196492871381509</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>AnalyticsAPI</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-196492874659821</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>AnalyticsAPI</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -35,7 +97,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -45,6 +107,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -54,4 +117,4 @@
</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/AnalyticsSecor/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml
index a0de40ab9..c20e767a0 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -19,13 +19,75 @@
<artifactNumToKeep>5</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196493724128621</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>AnalyticsSecor</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-196493728691761</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>AnalyticsSecor</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -34,7 +96,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -44,6 +106,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -53,4 +116,4 @@
</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 9aea1868e..24dcad973 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,13 +20,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196494527011530</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>AnalyticsSpark</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-196494532752488</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>AnalyticsSpark</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -35,7 +97,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -45,6 +107,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -54,4 +117,4 @@
</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/Cassandra/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Cassandra/config.xml
index abfcd287f..3ddc48990 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Cassandra/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,13 +20,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196495362297824</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>Cassandra</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-196495365827113</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>Cassandra</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.61">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+ <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>
@@ -35,16 +97,24 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
- <extensions/>
+ <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/provision/cassandra/Jenkinsfile</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/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
new file mode 100644
index 000000000..71b9386fc
--- /dev/null
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
@@ -0,0 +1,67 @@
+<?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>-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.29">
+ <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.63">
+ <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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>druid</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/provision/druid/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/InfluxDB/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/InfluxDB/config.xml
index d3dcbb10b..e0d7d7981 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/InfluxDB/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/InfluxDB/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -19,13 +19,75 @@
<artifactNumToKeep>5</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196496186070999</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>InfluxDB</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-196496195598788</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>InfluxDB</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -34,7 +96,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -44,6 +106,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -53,4 +116,4 @@
</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/Kafka/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kafka/config.xml
index 6d92ec2f4..2a3eca761 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kafka/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kafka/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,11 +20,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196496946659342</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>Kafka</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-196496948791638</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>Kafka</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>
@@ -32,7 +89,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -42,7 +99,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -62,4 +119,4 @@
</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/Kibana/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kibana/config.xml
index 38316772f..cac92eae5 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kibana/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kibana/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,13 +20,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196497749695581</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>Kibana</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-196497753237991</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>Kibana</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -35,7 +97,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -45,6 +107,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -54,4 +117,4 @@
</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/MLWorkbench/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
new file mode 100644
index 000000000..445d922aa
--- /dev/null
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
@@ -0,0 +1,67 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<flow-definition plugin="workflow-job@2.31">
+ <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.29">
+ <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.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>${public_repo_branch}</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>
+ <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/provision/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/Provision/jobs/dev/jobs/DataPipeline/jobs/Postgres/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Postgres/config.xml
index 33e61fb3d..bfed6405d 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Postgres/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Postgres/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -19,13 +19,75 @@
<artifactNumToKeep>5</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196498570819230</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>Postgres</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-196498577913500</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>Postgres</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -34,7 +96,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -44,6 +106,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -53,4 +116,4 @@
</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/Redis_Cluster/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Redis_Cluster/config.xml
new file mode 100644
index 000000000..b9b5b38d1
--- /dev/null
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Redis_Cluster/config.xml
@@ -0,0 +1,125 @@
+<?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>-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>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196501654566824</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>Redis_Cluster</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-196501660936815</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Redis_Cluster</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/provision/redis-cluster/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/TelemetrySearch/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/TelemetrySearch/config.xml
index b51b86935..d8fa81c34 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/TelemetrySearch/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/TelemetrySearch/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,11 +20,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196499327272611</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>TelemetrySearch</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-196499346601896</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>TelemetrySearch</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>
@@ -32,7 +89,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -42,7 +99,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -57,9 +114,9 @@
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
</scm>
- <scriptPath>pipelines/provision/telemetry_elasticsearch/Jenkinsfile</scriptPath>
+ <scriptPath>pipelines/provision/telemetry-elasticsearch/Jenkinsfile</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/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
index 9bf7797e3..a36f5c0d7 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,13 +20,75 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196500122471866</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>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-196500128714203</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>Yarn</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.63">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@4.0.0-rc">
+ <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>
@@ -35,7 +97,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -45,6 +107,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -54,4 +117,4 @@
</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/Zookeeper/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Zookeeper/config.xml
index a8b9cceb7..06a3e4ee5 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Zookeeper/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Zookeeper/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -19,11 +19,68 @@
<artifactNumToKeep>5</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196500899115571</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>Zookeeper</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-196500913815161</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>Zookeeper</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>
@@ -31,7 +88,7 @@
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -41,7 +98,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -61,4 +118,4 @@
</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/Cassandra/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Cassandra/config.xml
index a9a247e8d..dbf93f659 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Cassandra/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Cassandra/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,15 +20,77 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196501654566824</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>Cassandra</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-196501660936815</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Cassandra</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>
<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">
+ <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>
@@ -38,7 +100,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -58,4 +120,4 @@
</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/CompositeSearch/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml
index 360f4f174..176104383 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,15 +20,77 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196502397927441</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>CompositeSearch</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-196502408664232</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-learning-platform">project-sunbird/sunbird-learning-platform</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>CompositeSearch</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>
<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">
+ <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>
@@ -38,7 +100,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -46,7 +108,7 @@
<extensions>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
- <noTags>true</noTags>
+ <noTags>false</noTags>
<reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
@@ -58,4 +120,4 @@
</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/Kafka/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml
index 93354ef4c..ec96033a3 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,15 +20,77 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196503227911555</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>Kafka</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-196503234123956</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Kafka</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>
<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">
+ <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>
@@ -38,7 +100,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -58,4 +120,4 @@
</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/Learning/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
index bb374f354..9eb3a8c0b 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,11 +20,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196504004472286</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>Learning</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-196504007625526</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Learning</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>
@@ -35,7 +92,7 @@
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -45,7 +102,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -65,4 +122,4 @@
</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 68a62ccf6..bb4e62b0c 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,16 +20,78 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196504831541165</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>Neo4j</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-196504838020082</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Neo4j</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>
<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.61">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+ <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>
@@ -38,7 +100,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -58,4 +120,4 @@
</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/Redis/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis/config.xml
index cf7e9a532..758bcb5bb 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,16 +20,78 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196505638775314</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>Redis</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-196505642335779</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Redis</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>
<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.61">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.1">
+ <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>
@@ -38,7 +100,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -58,4 +120,4 @@
</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/Redis_Cluster/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis_Cluster/config.xml
new file mode 100644
index 000000000..b9b5b38d1
--- /dev/null
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis_Cluster/config.xml
@@ -0,0 +1,125 @@
+<?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>-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>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196501654566824</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>Redis_Cluster</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-196501660936815</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Redis_Cluster</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/provision/redis-cluster/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/KnowledgePlatform/jobs/Search/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
index 064d2fb01..1865d82b1 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,16 +20,78 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196506358953190</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>Search</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-196506370617817</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Search</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>
<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@4.0.0-rc">
+ <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>
@@ -38,7 +100,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -48,6 +110,7 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
+ <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -57,4 +120,4 @@
</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/Yarn/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index fe08c83f0..acdf2ac7f 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
+++ b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
@@ -1,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,11 +20,68 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196507093304506</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>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-196507098492671</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Yarn</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>
@@ -35,7 +92,7 @@
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.63">
+ <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
<configVersion>2</configVersion>
<userRemoteConfigs>
@@ -45,7 +102,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -65,4 +122,4 @@
</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/Zookeeper/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml
index 7c89cde9d..740a853a8 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,7 +1,7 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
+<flow-definition plugin="workflow-job@2.32">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,15 +20,77 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
+ <name>private_branch</name>
+ <description></description>
+ <randomName>choice-parameter-196485017539792</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>Zookeeper</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-196485022834542</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-learning-platform">project-sunbird/sunbird-learning-platform</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>Zookeeper</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>
<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">
+ <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>
@@ -38,7 +100,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${public_repo_branch}</name>
+ <name>${branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -58,4 +120,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
\ No newline at end of file
+</flow-definition>
diff --git a/deploy/jenkins/plugins.txt b/deploy/jenkins/plugins.txt
index 0aa9413aa..c4d12f3b5 100644
--- a/deploy/jenkins/plugins.txt
+++ b/deploy/jenkins/plugins.txt
@@ -1,99 +1,120 @@
junit@1.27
-workflow-basic-steps@2.14
+workflow-basic-steps@2.15
+variant@1.2
uno-choice@2.1
workflow-step-api@2.19
-pam-auth@1.4
+simple-theme-plugin@0.5.1
+pam-auth@1.5
jsch@0.1.55
-workflow-durable-task-step@2.29
-matrix-project@1.13
-docker-commons@1.13
-github-branch-source@2.4.2
-pipeline-model-api@1.3.4.1
-pipeline-rest-api@2.10
-lockable-resources@2.4
+workflow-durable-task-step@2.30
+matrix-project@1.14
+docker-commons@1.14
+github-branch-source@2.4.5
+blueocean-rest-impl@1.16.0
+pipeline-model-api@1.3.8
+pipeline-rest-api@2.11
+lockable-resources@2.5
pipeline-github-lib@1.0
+jacoco@3.0.4
ws-cleanup@0.37
-pipeline-build-step@2.7
+pipeline-build-step@2.9
conditional-buildstep@1.3.6
durable-task@1.29
-pipeline-model-extensions@1.3.4.1
+pipeline-model-extensions@1.3.8
jquery-ui@1.0.2
htmlpublisher@1.18
greenballs@1.15
-workflow-cps@2.63
+workflow-cps@2.67
+config-file-provider@3.6
+preSCMbuildstep@0.3
ssh-agent@1.17
-display-url-api@2.3.0
+display-url-api@2.3.1
structs@1.17
workflow-api@2.33
build-pipeline-plugin@1.5.8
ansicolor@0.6.2
-ssh-credentials@1.14
+ssh-credentials@1.15
pipeline-milestone-step@1.3.1
pipeline-graph-analysis@1.9
-token-macro@2.6
+token-macro@2.7
+blueocean-core-js@1.16.0
github@1.29.4
thinBackup@1.9
github-api@1.95
ldap@1.20
pipeline-model-declarative-agent@1.1.1
-gradle@1.30
+gradle@1.31
+blueocean-pipeline-editor@1.16.0
plain-credentials@1.5
workflow-support@3.2
-pipeline-model-definition@1.3.4.1
+pipeline-model-definition@1.3.8
matrix-auth@2.3
run-condition@1.2
windows-slaves@1.4
-build-name-setter@1.7.0
+build-name-setter@1.7.1
jquery@1.12.4-0
-active-directory@2.12
-script-security@1.53
+active-directory@2.13
+script-security@1.58
credentials@2.1.18
-copyartifact@1.41
+copyartifact@1.42
throttle-concurrents@2.0.1
-workflow-multibranch@2.20
+workflow-multibranch@2.21
ant@1.9
-branch-api@2.1.2
-email-ext@2.63
+branch-api@2.4.0
+email-ext@2.66
role-strategy@2.10
git@3.9.3
ssh-slaves@1.29.4
+view-job-filters@2.1.1
momentjs@1.1.1
-pipeline-stage-view@2.10
+pipeline-stage-view@2.11
apache-httpcomponents-client-4-api@4.5.5-3.0
+slack@2.22
jdk-tool@1.2
jackson2-api@2.9.8
+blueocean-web@1.16.0
workflow-scm-step@2.7
antisamy-markup-formatter@1.5
-credentials-binding@1.17
-docker-workflow@1.17
+credentials-binding@1.18
+docker-workflow@1.18
ace-editor@1.1
-workflow-job@2.31
-scm-api@2.3.0
+workflow-job@2.32
+blueocean-dashboard@1.16.0
+favorite@2.3.2
+blueocean-jwt@1.16.0
+scm-api@2.4.1
+blueocean-rest@1.16.0
bouncycastle-api@2.17
authentication-tokens@1.3
-jobConfigHistory@2.19
-pipeline-input-step@2.9
-javadoc@1.4
+jenkins-design-language@1.16.0
+jobConfigHistory@2.20
+pipeline-input-step@2.10
+javadoc@1.5
pipeline-stage-step@2.3
mailer@1.23
-code-coverage-api@1.0.7
+git-parameter@0.9.10
+code-coverage-api@1.0.9
handlebars@1.1.1
+blueocean-pipeline-api-impl@1.16.0
git-server@1.7
-git-client@2.7.6
+pipeline-multibranch-defaults@2.0
+git-client@2.7.7
+blueocean-pipeline-scm-api@1.16.0
command-launcher@1.3
resource-disposer@0.12
-rebuild@1.29
+rebuild@1.30
jquery-detached@1.2.1
build-timeout@1.19
workflow-aggregator@2.6
external-monitor-job@1.7
timestamper@1.9
-cloudbees-folder@6.7
+cloudbees-folder@6.8
audit-trail@2.4
maven-plugin@3.2
workflow-cps-global-lib@2.13
dashboard-view@2.10
cobertura@1.13
parameterized-trigger@2.35.2
-pipeline-stage-tags-metadata@1.3.4.1
-jacoco@3.0.4
+blueocean-commons@1.16.0
+pipeline-stage-tags-metadata@1.3.8
+pubsub-light@1.12
--
GitLab