From b22ce7cf14ac8f7987c99edff6582e98841cfb10 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Tue, 25 Jun 2019 14:41:17 +0530
Subject: [PATCH] Revert "feat: Merge jenkins configs from master (#562)"
(#563)
This reverts commit 96c031d116cec34b55ab446a0252bed854584fed.
---
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 +-
.../{ContentPlayer => CEPlugins}/config.xml | 14 +-
.../Plugins/jobs/CollectionEditor/config.xml | 5 +-
.../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 +-
.../{ContentPlugins => CEPlugins}/config.xml | 13 +-
.../Plugins/jobs/CollectionEditor/config.xml | 4 +-
.../config.xml | 8 +-
.../config.xml | 8 +-
.../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 +----
.../Core/jobs/LoggerElasticSearch}/config.xml | 11 +-
.../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 +-
.../{ContentPlugins => CEPlugins}/config.xml | 96 +++-----
.../Plugins/jobs/CollectionEditor/config.xml | 86 ++-----
.../config.xml | 96 +++-----
.../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 ------------
.../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 | 30 +--
.../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 +------
.../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 ++++----
196 files changed, 1101 insertions(+), 10423 deletions(-)
delete mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
delete mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Yarn/config.xml
delete mode 100644 deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
rename deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/{ContentPlayer => CEPlugins}/config.xml (88%)
rename deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/{ContentPlugins => ContentFramework}/config.xml (88%)
rename deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/{ContentEditor => ContentRendererPreview}/config.xml (88%)
delete mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
delete mode 100644 deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
delete mode 100644 deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
rename deploy/jenkins/jobs/Build/jobs/Plugins/jobs/{ContentPlugins => CEPlugins}/config.xml (89%)
rename deploy/jenkins/jobs/Build/jobs/Plugins/jobs/{ContentEditor => ContentFramework}/config.xml (95%)
rename deploy/jenkins/jobs/Build/jobs/Plugins/jobs/{ContentPlayer => ContentRendererPreview}/config.xml (95%)
delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
rename deploy/jenkins/jobs/{OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping => Deploy/jobs/dev/jobs/Core/jobs/LoggerElasticSearch}/config.xml (87%)
delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logstash/config.xml
delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml
delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
delete mode 100644 deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/AssetSizeMigration/config.xml
rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/{ContentPlugins => CEPlugins}/config.xml (58%)
rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/{ContentEditor => ContentFramework}/config.xml (58%)
rename deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/{ContentPlayer => ContentRendererPreview}/config.xml (58%)
delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml
delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
rename deploy/jenkins/jobs/{Provision/jobs/dev/jobs/DataPipeline/jobs/Druid => OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPILogs}/config.xml (60%)
delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CreateUser/config.xml
delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CustomMonitoring/config.xml
delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/KeyRotation/config.xml
delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml
delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml
delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CreateUser/config.xml
delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml
delete mode 100644 deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml
delete mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Logstash/config.xml
delete mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
delete mode 100644 deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Redis_Cluster/config.xml
delete 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 04abe3009..5e71deb9f 100755
--- a/deploy/jenkins/jenkins-jobs-setup.sh
+++ b/deploy/jenkins/jenkins-jobs-setup.sh
@@ -22,7 +22,6 @@ 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
@@ -32,8 +31,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 bash -c 'configPath=$0; jobPath=$(dirname $configPath); jobName=$(basename $jobPath); modulePath=${jobPath%/*/*}; moduleName=$(basename $modulePath); sed -i "s#ArtifactUpload/$1/$moduleName/.*<#Deploy/$2/$moduleName/$jobName<#g" $0' {} ${arr[0]} ${arr[$(($key - 1))]} \;
- find $JENKINS_TMP/Deploy/jobs/${arr[$key]} -type d -path "*Summary*" -prune -o -name config.xml -exec sed -i 's/<upstreamProjects>.*//g' {} \;
+ find $JENKINS_TMP/Deploy/jobs/${arr[$key]} -type 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]}/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
@@ -42,7 +41,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*' --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
+ colordiff -r --suppress-common-lines --no-dereference -x 'nextBuildNumber' -x 'builds' -x 'last*' /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 6ccb350fd..cea6ddf03 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.164.2
+sudo apt-get install -y jenkins=2.150.3
echo -e "\n\e[0;32m${bold}Installating PIP${normal}"
apt-get install -y python-pip
@@ -55,27 +55,12 @@ 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 a3e8cbe68..ad7e37aed 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 cc051470f..77af8f791 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 397432f38..b49d708c4 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,36 +7,28 @@
<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>
- <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>
+ <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>
+ <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/Core/AdminUtils</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
@@ -48,7 +40,7 @@
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
- <description><font color=dimgray size=2><b>
+ <description><font color=black size=2><b>
ArtifactRepo - Push the docker image to container registry.
</b></font></description>
<choices class="java.util.Arrays$ArrayList">
@@ -59,19 +51,6 @@ 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>
@@ -80,8 +59,21 @@ 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">
@@ -113,4 +105,4 @@ ArtifactRepo - Push the docker image to container registry.
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Badger/config.xml
index 7a4b219bb..8a360779a 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 08e2a6496..06009718e 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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
deleted file mode 100644
index 7df13ead9..000000000
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
+++ /dev/null
@@ -1,108 +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>
- <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 63b79ae5a..87cfd3e82 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 ee29acd2a..184683d64 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 56e5f8b78..d44ca7a71 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 c5ea94efe..41067d62d 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Player/config.xml
index a60c0a1ec..2ee20d9bc 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 281955d43..b3a102f15 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 9bb6a0028..f8d7173a2 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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
deleted file mode 100644
index 846956588..000000000
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Core/jobs/Yarn/config.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-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 5be56a4e0..68477b8ac 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.8">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.14"/>
+ <registry plugin="docker-commons@1.13"/>
</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 e030ca1a3..ea3935f10 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 c1e776515..d46ea63bc 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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
deleted file mode 100644
index 5404767f9..000000000
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-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 c7a78032b..667166840 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 7dc23f5af..73e480baa 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 e3162085b..b7727db72 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 c3ad728f7..991e40515 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 709f243f2..b45c513b5 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 5be56a4e0..e25dcd134 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/config.xml
@@ -1,11 +1,10 @@
<?xml version='1.1' encoding='UTF-8'?>
-<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.8">
- <actions/>
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
<description></description>
<properties>
- <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.14"/>
+ <registry plugin="docker-commons@1.13"/>
</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/ContentPlayer/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CEPlugins/config.xml
similarity index 88%
rename from deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
rename to deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CEPlugins/config.xml
index 6dcf3f76b..5c380348d 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/CEPlugins/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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=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>
+ <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>
<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=dimgray size=2><b>
+ <description><font color=black 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/ContentPlayer</upstreamProjects>
+ <upstreamProjects>Build/Plugins/CEPlugins</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.67">
+ <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>
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 fe9ade6a1..b071455dd 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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,7 +52,6 @@ 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/ContentPlugins/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentFramework/config.xml
similarity index 88%
rename from deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
rename to deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentFramework/config.xml
index 0d3a13392..0e4c842ce 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentFramework/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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=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>
+ <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>
<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=dimgray size=2><b>
+ <description><font color=black 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/ContentPlugins</upstreamProjects>
+ <upstreamProjects>Build/Plugins/ContentFramework</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.67">
+ <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>
diff --git a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentRendererPreview/config.xml
similarity index 88%
rename from deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
rename to deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentRendererPreview/config.xml
index 9b43d7d8f..f699829e2 100644
--- a/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
+++ b/deploy/jenkins/jobs/ArtifactUpload/jobs/dev/jobs/Plugins/jobs/ContentRendererPreview/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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=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>
+ <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>
<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=dimgray size=2><b>
+ <description><font color=black 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/ContentEditor</upstreamProjects>
+ <upstreamProjects>Build/Plugins/ContentRendererPreview</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.67">
+ <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>
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 4f2734409..4ce788e56 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 4a039c448..e774141dd 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/APIManager/config.xml
@@ -1,16 +1,14 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+ <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>
@@ -18,26 +16,23 @@
<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</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 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>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 a19a4fe04..47f3fd52b 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>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Cassandra/config.xml
index d77cfadf3..8aef6a2b1 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>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
deleted file mode 100644
index b210fdcb1..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/CassandraTrigger/config.xml
+++ /dev/null
@@ -1,109 +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>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 ef4e58fa8..aaba53827 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>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>true</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 69fada37d..24de44f2a 100644
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Config/config.xml
@@ -42,7 +42,6 @@
<throttleOption>project</throttleOption>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
- <configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
@@ -62,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,5 +80,5 @@
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>true</disabled>
-</flow-definition>
+ <disabled>false</disabled>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Content/config.xml
index e570ec529..5e188b455 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>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -74,4 +74,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Keycloak/config.xml
index 55b940ce0..19f208676 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>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -74,4 +74,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Learner/config.xml
index 16bec1304..7effd5e77 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.67">
+ <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>
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
+ <name>${public_repo_branch}</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 c6ef2fe93..91415a2d4 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.67">
+ <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>
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
+ <name>${public_repo_branch}</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 544ddccc7..82d230efb 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>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -72,4 +72,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Telemetry/config.xml
index fd47188c6..ae99c15c5 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>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
deleted file mode 100644
index 65c3c4c5d..000000000
--- a/deploy/jenkins/jobs/Build/jobs/Core/jobs/Yarn/config.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-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 5be56a4e0..68477b8ac 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.8">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.14"/>
+ <registry plugin="docker-commons@1.13"/>
</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 833d261ee..692838a32 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>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 acd6b196b..aeadd32be 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>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
deleted file mode 100644
index b51e8a319..000000000
--- a/deploy/jenkins/jobs/Build/jobs/DataPipeline/jobs/MLWorkbench/config.xml
+++ /dev/null
@@ -1,80 +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>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 442129420..dae00811d 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>secor-0.25</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 d2f5a42be..a631630f3 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.67">
+ <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>
@@ -61,7 +61,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
+ <name>${public_repo_branch}</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 f545a823a..b0d44a444 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>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 0632b08b6..d057b1b82 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>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -81,4 +81,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 061e714fa..4b67a7fe7 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.67">
+ <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>
@@ -68,7 +68,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
+ <name>${public_repo_branch}</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 5be56a4e0..68477b8ac 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.8">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.14"/>
+ <registry plugin="docker-commons@1.13"/>
</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/ContentPlugins/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CEPlugins/config.xml
similarity index 89%
rename from deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
rename to deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CEPlugins/config.xml
index 7d87bd630..0280e4893 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlugins/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/CEPlugins/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -36,11 +36,8 @@
<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">
+ <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>
@@ -50,7 +47,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -70,4 +67,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 ada41eaed..4c72168f2 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>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -67,4 +67,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentFramework/config.xml
similarity index 95%
rename from deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
rename to deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentFramework/config.xml
index f62674f83..0b658bc43 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentEditor/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentFramework/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.67">
+ <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>
@@ -47,7 +47,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentRendererPreview/config.xml
similarity index 95%
rename from deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
rename to deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentRendererPreview/config.xml
index efd584951..5256477d2 100644
--- a/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentPlayer/config.xml
+++ b/deploy/jenkins/jobs/Build/jobs/Plugins/jobs/ContentRendererPreview/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.67">
+ <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>
@@ -47,7 +47,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
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 85c97b29a..0c8521698 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>${github_release_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -67,4 +67,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/APIManager/config.xml
index 30513fa44..817790d54 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,67 +28,16 @@
<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>
+ <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/Core/APIManager</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
+ <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>
- <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">
@@ -125,7 +74,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -145,4 +94,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/AdminUtils/config.xml
index c9eb87767..3f6023230 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,67 +28,16 @@
<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>
+ <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/Core/AdminUtils</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
+ <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>
- <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">
@@ -125,7 +74,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -145,4 +94,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ApplicationElasticSearch/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/ApplicationElasticSearch/config.xml
index 33dcb7914..360fb0873 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,68 +13,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -82,7 +25,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -92,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -112,4 +55,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Badger/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Badger/config.xml
index 2a243f37d..fef35385e 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,67 +28,16 @@
<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>
+ <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/Core/Badger</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
+ <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>
- <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">
@@ -114,7 +63,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -134,4 +83,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Bootstrap/config.xml
index 54d79c38f..d18ba3095 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,61 +20,10 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>hosts</name>
- <description><font color=dimgray size=2><b>Enter the host name to be bootstrapped.</b></font></description>
+ <description><font color=black 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">
@@ -97,7 +46,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -109,4 +58,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Cassandra/config.xml
index aa59259e3..bc84353c7 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.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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">
+ <secureScript plugin="script-security@1.53">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<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.58">
+ <secureScript plugin="script-security@1.53">
<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.58">
+ <secureFallbackScript plugin="script-security@1.53">
<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.58">
+ <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, artifact version will be taken from the latest metadata.json.</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, 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">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -104,57 +104,6 @@ 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">
@@ -181,7 +130,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -191,7 +140,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -211,4 +160,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
deleted file mode 100644
index e0da22c39..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/CassandraTrigger/config.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-1</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>5</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/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 e921e22d1..fa056df08 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,67 +28,16 @@
<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>
+ <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/Core/Config</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
+ <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>
- <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">
@@ -114,7 +63,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -134,4 +83,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Content/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Content/config.xml
index b71b638f5..4ed5b292c 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,67 +28,16 @@
<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>
+ <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/Core/Content</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
+ <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>
- <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">
@@ -125,7 +74,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -145,4 +94,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/FuntionalTestCases/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/FuntionalTestCases/config.xml
index 60006f9f8..1e97feaa5 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <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">
+ <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/>
@@ -27,13 +27,11 @@
<artifactNumToKeep>-1</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <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>
@@ -42,7 +40,7 @@
<configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -52,7 +50,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>
@@ -64,4 +62,4 @@
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Keycloak/config.xml
index 5e532b85d..44631971c 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</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, artifact version will be taken from the latest metadata.json.</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, latest built artifact will be deployed.</b></font>"""
}
else {
return "<b>Not Applicable</b>"
@@ -104,57 +104,6 @@ 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">
@@ -191,7 +140,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -211,4 +160,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/KeycloakRealm/config.xml
index f91b7fbd8..6a9232507 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,68 +20,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -92,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -102,7 +45,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>keycloak-deployment</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -122,4 +65,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Learner/config.xml
index 13fdfdfa6..82ccfbd15 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,67 +28,16 @@
<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>
+ <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/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, image tag will be taken from the latest metadata.json.</b></font></description>
+ <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>
- <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">
@@ -125,7 +74,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -145,4 +94,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggerElasticSearch/config.xml
similarity index 87%
rename from deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggerElasticSearch/config.xml
index 3737001e7..d1cee1407 100644
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/ESMapping/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/LoggerElasticSearch/config.xml
@@ -26,9 +26,6 @@
<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">
@@ -40,7 +37,7 @@
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -50,14 +47,14 @@
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
+ <depth>1</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
</scm>
- <scriptPath>pipelines/esmapping/Jenkinsfile</scriptPath>
+ <scriptPath>pipelines/deploy/logger-elasticsearch/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logging/config.xml
index ed0af2324..1dfbb2a98 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,65 +13,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -82,7 +27,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -92,7 +37,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -112,4 +57,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logstash/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logstash/config.xml
deleted file mode 100644
index 40ece3d11..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Logstash/config.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-1</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>5</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <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 111fbdb88..9a870e34b 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,65 +13,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -82,7 +27,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -92,7 +37,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -112,4 +57,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardAPIs/config.xml
index f66552e01..26970f24e 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,65 +20,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -89,7 +34,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -99,7 +44,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -119,4 +64,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardConsumers/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/OnboardConsumers/config.xml
index 564c1fdfe..13772a78b 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,68 +13,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -82,7 +25,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -92,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -112,4 +55,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Player/config.xml
index 8d28a949d..90e08fdc7 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -28,73 +28,16 @@
<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>
+ <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/Core/Player</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
+ <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>
- <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">
@@ -121,7 +64,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -131,7 +74,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</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 84389ee47..5bfc2f12e 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.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -21,67 +21,16 @@
<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>
+ <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/Core/Proxy</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
+ <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>
- <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">
@@ -108,7 +57,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -118,7 +67,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -138,4 +87,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Telemetry/config.xml
index 7b3b96d35..a9d95f0f7 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,67 +28,16 @@
<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>
+ <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/Core/Telemetry</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>image_tag</name>
- <description><font color=red size=2><b>CAUTION: If the value is blank, image tag will be taken from the latest metadata.json.</b></font></description>
+ <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>
- <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">
@@ -125,7 +74,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -145,4 +94,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstash/config.xml
index 3f59f70e3..b167ae016 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description>Deploys Telemetry Logstash Service</description>
<keepDependencies>false</keepDependencies>
@@ -13,65 +13,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -82,7 +27,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -92,7 +37,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -112,4 +57,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstashDataPipeline/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/TelemetryLogstashDataPipeline/config.xml
index e0c97eb85..602e2eda1 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description>Deploys Telemetry Logstash Datapipeline Service</description>
<keepDependencies>false</keepDependencies>
@@ -13,68 +13,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -82,7 +25,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -92,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -112,4 +55,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml
deleted file mode 100644
index 501c8bff7..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Core/jobs/Yarn/config.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-1</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>5</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <hudson.model.StringParameterDefinition>
- <name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Core/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 5be56a4e0..68477b8ac 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.8">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.14"/>
+ <registry plugin="docker-commons@1.13"/>
</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 0e536fb0c..17352bf36 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/Analytics</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>
+ <description><font color=black 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[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</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, artifact version will be taken from the latest metadata.json.</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, latest built artifact will be deployed.</b></font>"""
}
else {
return "<b>Not Applicable</b>"
@@ -111,57 +111,6 @@ 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">
@@ -198,7 +147,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -218,4 +167,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/AnalyticsFetchLogs/config.xml
index ce75cba48..bdb453294 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=dimgray size=2><b>Choose the instance to fetch logs.</b></font></description>
+ <description><font color=black 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=dimgray size=2><b>Choose one of the option - Fetch logs or set cronjob.</b></font></description>
+ <description><font color=black 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,57 +48,6 @@
</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">
@@ -121,7 +70,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -140,5 +89,5 @@ return """<b>This parameter is not used</b>"&quo
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>false</disabled>
-</flow-definition>
+ <disabled>true</disabled>
+</flow-definition>
\ No newline at end of file
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 d8b388c43..1dfdaca57 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,65 +20,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -89,7 +34,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -99,7 +44,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -118,5 +63,5 @@ return """<b>This parameter is not used</b>"&quo
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>false</disabled>
-</flow-definition>
+ <disabled>true</disabled>
+</flow-definition>
\ No newline at end of file
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 1303af19c..d7a72eae8 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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=dimgray size=2><b>Mention the consumer ID.</b></font></description>
+ <description><font color=black 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=dimgray size=2><b>Channel ID to map with the Consumer ID.</b></font></description>
+ <description><font color=black 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=dimgray size=2><b> 1 - to activate, 0 - to make it inactive</b></font></description>
+ <description><font color=black 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,61 +50,10 @@
</hudson.model.ChoiceParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>Created_by</name>
- <description><font color=dimgray size=2><b>Created by.</b></font></description>
+ <description><font color=black 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">
@@ -115,10 +64,9 @@ return """<b>This parameter is not used</b>"&quo
<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.66">
+ <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>
@@ -128,7 +76,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -147,5 +95,5 @@ return """<b>This parameter is not used</b>"&quo
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>false</disabled>
-</flow-definition>
+ <disabled>true</disabled>
+</flow-definition>
\ No newline at end of file
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 b497a6b76..5118f0100 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=dimgray size=2><b>Specify cql_query if any tables needs to be truncated.<b></font></description>
+ <description><font color=black 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=dimgray size=2><b>Specify the job type - Replay or Run.</b></font></description>
+ <description><font color=black 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,79 +46,28 @@
</hudson.model.ChoiceParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>job_id</name>
- <description><font color=dimgray size=2><b>Specify the job id.</b></font></description>
+ <description><font color=black 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=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>
+ <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>
<defaultValue>2017-05-01</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>end_date</name>
- <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>
+ <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>
<defaultValue>2017-07-11</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>pause_min</name>
- <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>
+ <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>
<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">
@@ -141,7 +90,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -160,5 +109,5 @@ return """<b>This parameter is not used</b>"&quo
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>false</disabled>
-</flow-definition>
+ <disabled>true</disabled>
+</flow-definition>
\ No newline at end of file
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 62cacabb9..18d2b6956 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -28,61 +28,10 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>pause_min</name>
- <description><font color=dimgray size=2><b>Pause for # of minutes.</b></font></description>
+ <description><font color=black 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">
@@ -93,10 +42,9 @@ return """<b>This parameter is not used</b>"&quo
<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.66">
+ <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>
@@ -106,7 +54,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -125,5 +73,5 @@ return """<b>This parameter is not used</b>"&quo
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>false</disabled>
-</flow-definition>
+ <disabled>true</disabled>
+</flow-definition>
\ No newline at end of file
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 639011b4c..4bc26f549 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -32,57 +32,6 @@
<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">
@@ -94,7 +43,7 @@ return """<b>This parameter is not used</b>"&quo
<configVersion>1</configVersion>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -104,7 +53,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -123,5 +72,5 @@ return """<b>This parameter is not used</b>"&quo
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>false</disabled>
-</flow-definition>
+ <disabled>true</disabled>
+</flow-definition>
\ No newline at end of file
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 df883dd1d..18e57478a 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,65 +20,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -89,7 +34,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -99,7 +44,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -119,4 +64,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/DataProducts/config.xml
index 4dbe92287..8555c74ae 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/Analytics</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>
+ <description><font color=black 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.58">
+ <secureScript plugin="script-security@1.53">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<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.58">
+ <secureScript plugin="script-security@1.53">
<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.58">
+ <secureFallbackScript plugin="script-security@1.53">
<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.58">
+ <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, artifact version will be taken from the latest metadata.json.</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, 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">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -111,57 +111,6 @@ 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">
@@ -188,7 +137,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -198,7 +147,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -218,4 +167,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaIndexer/config.xml
index d60816f21..9e446e5f2 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,65 +20,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -89,7 +34,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -99,7 +44,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -119,4 +64,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/KafkaSetup/config.xml
index fd771c74a..daa463c46 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,65 +20,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -89,7 +34,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -99,7 +44,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -119,4 +64,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
deleted file mode 100644
index 4ad0e0eae..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.31">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-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 dcfdb361b..c17fd285d 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,65 +13,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -85,7 +30,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec></spec>
- <upstreamProjects></upstreamProjects>
+ <upstreamProjects>../Core/Monitoring</upstreamProjects>
<threshold>
<name>FAILURE</name>
<ordinal>2</ordinal>
@@ -96,7 +41,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -106,7 +51,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -126,4 +71,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/SamzaTelemetrySchemas/config.xml
index fa3c7e238..0aca8d3e7 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,61 +28,10 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>schema_repo_version</name>
- <description><font color=dimgray size=2><b>Specify the scehma repo version.</b></font></description>
- <defaultValue>${branch_or_tag}</defaultValue>
+ <description><font color=black size=2><b>Specify the scehma repo version.</b></font></description>
+ <defaultValue>${public_repo_branch}</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">
@@ -105,7 +54,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -125,4 +74,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Secor/config.xml
index 3287cf7e1..c6280e146 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/Secor</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>
+ <description><font color=black 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.58">
+ <secureScript plugin="script-security@1.53">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<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.58">
+ <secureScript plugin="script-security@1.53">
<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.58">
+ <secureFallbackScript plugin="script-security@1.53">
<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.58">
+ <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, artifact version will be taken from the latest metadata.json.</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, 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">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -111,57 +111,6 @@ 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">
@@ -188,7 +137,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -198,7 +147,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -218,4 +167,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/DataPipeline/jobs/Yarn/config.xml
index ba4495c42..5b03ff4cb 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/DataPipeline</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>
+ <description><font color=black 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.58">
+ <secureScript plugin="script-security@1.53">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<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.58">
+ <secureScript plugin="script-security@1.53">
<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.58">
+ <secureFallbackScript plugin="script-security@1.53">
<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.58">
+ <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, artifact version will be taken from the latest metadata.json.</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, 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">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -111,57 +111,6 @@ 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">
@@ -188,7 +137,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -198,7 +147,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -218,4 +167,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/AssetSizeMigration/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/AssetSizeMigration/config.xml
deleted file mode 100644
index f609599a8..000000000
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/AssetSizeMigration/config.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-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 300590a6f..5109183f5 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,65 +20,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -92,7 +37,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -102,7 +47,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -122,4 +67,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ContentTool/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ContentTool/config.xml
index a07c4a404..d4b296559 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,73 +28,22 @@
<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>
+ <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/KnowledgePlatform/KnowledgePlatform</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>command</name>
- <description><font color=dimgray size=2><b>Enter the command.</b></font></description>
+ <description><font color=black 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=dimgray size=2><b>Enter the do id.</b></font></description>
+ <description><font color=black 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">
@@ -120,7 +69,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -140,4 +89,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FileSyncTool/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FileSyncTool/config.xml
index 1a51b321a..5c730b938 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,67 +28,16 @@
<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>
+ <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/KnowledgePlatform/Synctool</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>filename</name>
- <description><font color=dimgray size=2><b>Enter valid filename with extention.</b></font></description>
+ <description><font color=black 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">
@@ -111,7 +60,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -131,4 +80,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/KafkaSetup/config.xml
index 9890fc895..9271927d8 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,65 +20,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -92,7 +37,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -102,7 +47,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -122,4 +67,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
index 15ef082d9..1bb8dee30 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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>
+ <description><font color=black 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">
+ <secureScript plugin="script-security@1.53">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<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.58">
+ <secureScript plugin="script-security@1.53">
<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.58">
+ <secureFallbackScript plugin="script-security@1.53">
<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.58">
+ <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, artifact version will be taken from the latest metadata.json.</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, 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">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -111,57 +111,6 @@ 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">
@@ -188,7 +137,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -198,7 +147,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -218,4 +167,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Monitoring/config.xml
index a12d3f078..7ddf1d3e3 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,68 +13,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -85,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec></spec>
- <upstreamProjects></upstreamProjects>
+ <upstreamProjects>../DataPipeline/Monitoring</upstreamProjects>
<threshold>
<name>FAILURE</name>
<ordinal>2</ordinal>
@@ -96,7 +39,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -106,7 +49,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -126,4 +69,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index 1e2a79973..25b009260 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</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, artifact version will be taken from the latest metadata.json.</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, latest built artifact will be deployed.</b></font>"""
}
else {
return "<b>Not Applicable</b>"
@@ -111,57 +111,6 @@ 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">
@@ -187,7 +136,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -207,4 +156,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jDefinitionUpdate/config.xml
index 92bd78aae..8eaf214cc 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,68 +20,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -92,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -102,7 +45,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -122,4 +65,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4jElasticSearchSyncTool/config.xml
index dcbed687f..277ab59d9 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</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, artifact version will be taken from the latest metadata.json.</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, latest built artifact will be deployed.</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=dimgray size=2><b>Select a command</b></font></description>
+ <description><font color=black 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=dimgray size=2><b>It is parameter to pass with command.<br>
+ <description><font color=black size=2><b>It is parameter to pass with command.<br>
ex:<br>
--objectType Content<br>
--ids do_10101010,do_20202020<br>
@@ -136,57 +136,6 @@ 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">
@@ -212,7 +161,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -232,4 +181,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Search/config.xml
index d2631728a..d1ef2ccb9 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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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>
+ <description><font color=black 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[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</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, artifact version will be taken from the latest metadata.json.</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, latest built artifact will be deployed.</b></font>"""
}
else {
return "<b>Not Applicable</b>"
@@ -111,57 +111,6 @@ 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">
@@ -198,7 +147,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -218,4 +167,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StartNeo4jCluster/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StartNeo4jCluster/config.xml
index a74732892..9385b056f 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,65 +20,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -92,7 +37,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -102,7 +47,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -122,4 +67,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StopNeo4jCluster/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/StopNeo4jCluster/config.xml
index 171131550..fadcb50b6 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,65 +20,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -92,7 +37,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -102,7 +47,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -122,4 +67,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ValidateLearning/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/ValidateLearning/config.xml
index 70cf30e77..599982859 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,68 +20,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -92,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -102,7 +45,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -122,4 +65,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index 709d47b66..880c93ef5 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
+ <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/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=dimgray size=2><b>
+ <description><font color=black 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.58">
+ <secureScript plugin="script-security@1.53">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<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.58">
+ <secureScript plugin="script-security@1.53">
<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.58">
+ <secureFallbackScript plugin="script-security@1.53">
<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.58">
+ <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, artifact version will be taken from the latest metadata.json.</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, 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">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -111,57 +111,6 @@ 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">
@@ -188,7 +137,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -198,7 +147,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -218,4 +167,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/config.xml
index 5be56a4e0..68477b8ac 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.8">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.14"/>
+ <registry plugin="docker-commons@1.13"/>
</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/ContentPlugins/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CEPlugins/config.xml
similarity index 58%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CEPlugins/config.xml
index 5e13a75c6..53ae131d1 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlugins/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CEPlugins/config.xml
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -13,30 +13,36 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Plugins/ContentPlugins</defaultValue>
+ <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>
<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>
+ <description><font color=black size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-620062284617427</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.58">
+ <secureScript plugin="script-security@1.53">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentPlugins</projectName>
+ <projectName>CEPlugins</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters></referencedParameters>
<choiceType>PT_SINGLE_SELECT</choiceType>
@@ -49,7 +55,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.58">
+ <secureScript plugin="script-security@1.53">
<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>"""
}
@@ -59,12 +65,12 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentPlugins</projectName>
+ <projectName>CEPlugins</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters>artifact_source</referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -76,76 +82,26 @@ 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.58">
+ <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, artifact version will be taken from the latest metadata.json.</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, 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">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentPlugins</projectName>
+ <projectName>CEPlugins</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">
@@ -161,7 +117,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Plugins/ContentPlugins</upstreamProjects>
+ <upstreamProjects>ArtifactUpload/dev/Plugins/CEPlugins</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -172,7 +128,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -182,7 +138,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/CollectionEditor/config.xml
index 9550a52ea..e097c5284 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -13,25 +13,31 @@
<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>
+ <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/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=dimgray size=2><b>
+ <description><font color=black size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-620062284617427</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.58">
+ <secureScript plugin="script-security@1.53">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -49,7 +55,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.58">
+ <secureScript plugin="script-security@1.53">
<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>"""
}
@@ -59,7 +65,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -76,16 +82,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.58">
+ <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, artifact version will be taken from the latest metadata.json.</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, 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">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -96,56 +102,6 @@ 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">
@@ -172,7 +128,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -182,7 +138,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentFramework/config.xml
similarity index 58%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentFramework/config.xml
index f2e12695a..6103ba644 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentEditor/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentFramework/config.xml
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -13,30 +13,36 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Plugins/ContentEditor</defaultValue>
+ <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>
<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>
+ <description><font color=black size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-620062284617427</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.58">
+ <secureScript plugin="script-security@1.53">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentEditor</projectName>
+ <projectName>ContentFramework</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters></referencedParameters>
<choiceType>PT_SINGLE_SELECT</choiceType>
@@ -49,7 +55,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.58">
+ <secureScript plugin="script-security@1.53">
<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>"""
}
@@ -59,12 +65,12 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentEditor</projectName>
+ <projectName>ContentFramework</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters>artifact_source</referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -76,76 +82,26 @@ 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.58">
+ <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, artifact version will be taken from the latest metadata.json.</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, 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">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentEditor</projectName>
+ <projectName>ContentFramework</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">
@@ -161,7 +117,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Plugins/ContentEditor</upstreamProjects>
+ <upstreamProjects>ArtifactUpload/dev/Plugins/ContentFramework</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -172,7 +128,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -182,7 +138,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentRendererPreview/config.xml
similarity index 58%
rename from deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
rename to deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentRendererPreview/config.xml
index ac0f00835..d25ae6458 100644
--- a/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentPlayer/config.xml
+++ b/deploy/jenkins/jobs/Deploy/jobs/dev/jobs/Plugins/jobs/ContentRendererPreview/config.xml
@@ -1,11 +1,11 @@
<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -13,30 +13,36 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>absolute_job_path</name>
- <description><font color=dimgray size=2><b>Do not change this value! The metadata.json will be copied from this job.</b></font></description>
- <defaultValue>ArtifactUpload/dev/Plugins/ContentPlayer</defaultValue>
+ <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>
<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>
+ <description><font color=black size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-620062284617427</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.58">
+ <secureScript plugin="script-security@1.53">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentPlayer</projectName>
+ <projectName>ContentRendererPreview</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters></referencedParameters>
<choiceType>PT_SINGLE_SELECT</choiceType>
@@ -49,7 +55,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.58">
+ <secureScript plugin="script-security@1.53">
<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>"""
}
@@ -59,12 +65,12 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentPlayer</projectName>
+ <projectName>ContentRendererPreview</projectName>
<parameters class="linked-hash-map"/>
<referencedParameters>artifact_source</referencedParameters>
<choiceType>ET_FORMATTED_HTML</choiceType>
@@ -76,76 +82,26 @@ 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.58">
+ <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, artifact version will be taken from the latest metadata.json.</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, 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">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
</script>
- <projectName>ContentPlayer</projectName>
+ <projectName>ContentRendererPreview</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">
@@ -161,7 +117,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec></spec>
- <upstreamProjects>ArtifactUpload/dev/Plugins/ContentPlayer</upstreamProjects>
+ <upstreamProjects>ArtifactUpload/dev/Plugins/ContentRendererPreview</upstreamProjects>
<threshold>
<name>SUCCESS</name>
<ordinal>0</ordinal>
@@ -172,7 +128,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -182,7 +138,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</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 9f46a06ef..2fc9a8360 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
<properties>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -13,25 +13,31 @@
<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>
+ <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/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=dimgray size=2><b>
+ <description><font color=black size=2><b>
ArtifactRepo - Download the artifact from azure blob, JenkinsJob - Use the atrifact from Jenkins job.</b></font></description>
<randomName>choice-parameter-620062284617427</randomName>
<visibleItemCount>1</visibleItemCount>
<script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.58">
+ <secureScript plugin="script-security@1.53">
<script>return[
-'JenkinsJob',
-'ArtifactRepo'
+'ArtifactRepo',
+'JenkinsJob'
]</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -49,7 +55,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.58">
+ <secureScript plugin="script-security@1.53">
<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>"""
}
@@ -59,7 +65,7 @@ return "<b>Not Applicable</b>"
}</script>
<sandbox>false</sandbox>
</secureScript>
- <secureFallbackScript plugin="script-security@1.58">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -76,16 +82,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.58">
+ <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, artifact version will be taken from the latest metadata.json.</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, 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">
+ <secureFallbackScript plugin="script-security@1.53">
<script></script>
<sandbox>false</sandbox>
</secureFallbackScript>
@@ -96,56 +102,6 @@ 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">
@@ -172,7 +128,7 @@ return """<b>This parameter is not used</b>"&quo
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -182,7 +138,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</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 0b6afa894..ff31ba71a 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,84 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -99,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -109,7 +38,6 @@ return """<b>This parameter is not used</b>"&quo
<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 e1d3226eb..71f6ef2c8 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,75 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -90,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -100,7 +38,6 @@ return """<b>This parameter is not used</b>"&quo
<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 9b168d96d..8e9ca19f1 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -32,62 +32,9 @@
<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>
@@ -95,7 +42,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.67">
+ <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>
@@ -105,7 +52,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -125,4 +72,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 91b4ac4ab..7bbf214a5 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,84 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -99,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -109,7 +38,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -119,4 +47,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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
deleted file mode 100644
index 249c04df0..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/CreateUser/config.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.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/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
deleted file mode 100644
index 9f5638db9..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/GrafanaBackup/config.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-1</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>5</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <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 1880fa9db..b42a47c73 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.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -21,85 +21,34 @@
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>bootstrap_user</name>
- <description><font color="black" size=2><b>Deployer user</b></font></description>
+ <description>deployer user</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>
+ <description>Deployer user public key keep in single quotes</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>
+ <description>ops user</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>
+ <description>location of ssh key for ops user from '/'</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>
+ <description>ops public key</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">
@@ -112,7 +61,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -122,7 +71,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -142,4 +91,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/LoggerElasticSearchBackup/config.xml
index c7d211319..1b2680943 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,84 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -99,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -109,7 +38,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -119,4 +47,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 53aa24f43..155b4a90a 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,75 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -90,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -100,7 +38,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -110,4 +47,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 ca87b16be..faa94b00f 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,75 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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>
@@ -90,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -110,4 +48,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 64500d857..9ad72ff26 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,75 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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>
@@ -90,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -110,4 +48,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 7db6e451b..8e757f82b 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,84 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -99,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -109,7 +38,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -119,4 +47,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 429a4261f..cec50282a 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,75 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>private_branch</name>
- <description></description>
- <randomName>choice-parameter-189723213053334</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.57">
- <script>if (override_private_branch.equals("true")) {
-return """<input name="value" value="${private_repo_branch}" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Change this value to checkout a different branch from private repository.</b></font>"""
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.57">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>SwarmBootstrap</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- <org.biouno.unochoice.DynamicReferenceParameter plugin="uno-choice@2.1">
- <name>branch_or_tag</name>
- <description></description>
- <randomName>choice-parameter-189723215007628</randomName>
- <visibleItemCount>1</visibleItemCount>
- <script class="org.biouno.unochoice.model.GroovyScript">
- <secureScript plugin="script-security@1.57">
- <script>if (override_public_branch.equals("true")) {
-return """<input name="value" value="" class="setting-input" type="text"><br> <font color=dimgray size=2><b>Provide the tag or branch name to checkout the Jenkinsfile and codebase.<br>Note: The tag or branch name for this job should be taken from <a href="https://github.com/project-sunbird/sunbird-devops">project-sunbird/sunbird-devops</a></b></font></b></font>""";
-
-}
-else
-return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureScript>
- <secureFallbackScript plugin="script-security@1.57">
- <script>return """<b>This parameter is not used</b>"""</script>
- <sandbox>false</sandbox>
- </secureFallbackScript>
- </script>
- <projectName>SwarmBootstrap</projectName>
- <parameters class="linked-hash-map"/>
- <referencedParameters></referencedParameters>
- <choiceType>ET_FORMATTED_HTML</choiceType>
- <omitValueField>true</omitValueField>
- </org.biouno.unochoice.DynamicReferenceParameter>
- </parameterDefinitions>
- </hudson.model.ParametersDefinitionProperty>
- <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
- <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
- <throttleEnabled>false</throttleEnabled>
- <throttleOption>project</throttleOption>
- <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
- <paramsToUseForLimit></paramsToUseForLimit>
- </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -90,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -100,7 +38,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -110,4 +47,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 e5b5ea47c..68477b8ac 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.8">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.7">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.14"/>
+ <registry plugin="docker-commons@1.13"/>
</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>
+</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPILogs/config.xml
similarity index 60%
rename from deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
rename to deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPILogs/config.xml
index 71b9386fc..c89f254ee 100644
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Druid/config.xml
+++ b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/AnalyticsAPILogs/config.xml
@@ -24,42 +24,26 @@
<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">
+ <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/Kaali09/sunbird-data-pipeline.git</url>
+ <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>druid</name>
+ <name>DO-380</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>
+ <extensions/>
</scm>
- <scriptPath>pipelines/provision/druid/Jenkinsfile</scriptPath>
+ <scriptPath>pipelines/analytics-api-logs/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
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 7b842f76d..df91bff4c 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.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -25,69 +25,11 @@
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -96,7 +38,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -106,7 +48,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -116,4 +57,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 ddf95258d..8b27f18cb 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -38,77 +38,17 @@
<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.66">
+ <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>
@@ -118,7 +58,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -138,4 +78,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 adc5e79cc..b4c7ea72a 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -38,69 +38,11 @@
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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>
@@ -109,7 +51,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -129,4 +71,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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
deleted file mode 100644
index 933f47e1e..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CreateUser/config.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.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
deleted file mode 100644
index 058ef3913..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/CustomMonitoring/config.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-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 0205cb8e3..3f1226986 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -32,77 +32,17 @@
<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.66">
+ <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>
@@ -112,7 +52,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -132,4 +72,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 bfa6996b0..311d76650 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -40,69 +40,11 @@ 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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -111,7 +53,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -121,7 +63,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -131,4 +72,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/InfluxDBBackup/config.xml
index f83da39bf..7723d1b63 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,83 +20,19 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
+ <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>
@@ -106,7 +42,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -126,4 +62,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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
deleted file mode 100644
index faaea481f..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/KeyRotation/config.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-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 24282ed99..018f24c55 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,75 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -90,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -110,4 +48,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 964df78a2..6516c5daf 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,75 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -90,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -110,4 +48,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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
deleted file mode 100644
index f378f722f..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaMonitoringProvision/config.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-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
deleted file mode 100644
index 65ba441eb..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/DataPipeline/jobs/SamzaOrphanprocessAlert/config.xml
+++ /dev/null
@@ -1,85 +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>
- <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 62b910c1e..0e32e6c07 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -12,7 +12,7 @@
<artifactNumToKeep>5</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -24,69 +24,11 @@
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -95,7 +37,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -115,4 +57,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CassandraBackup/config.xml
index 60e4cfa80..37d9df319 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.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -31,57 +31,6 @@
<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">
@@ -93,15 +42,8 @@ return """<b>This parameter is not used</b>"&quo
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <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.66">
+ <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>
@@ -111,7 +53,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -131,4 +73,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 9ef5802d1..2e1f614b7 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.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -31,69 +31,11 @@
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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>
@@ -102,7 +44,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -122,4 +64,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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
deleted file mode 100644
index 97338a182..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/CreateUser/config.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.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 2f4001e05..dff07e183 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,65 +13,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -81,15 +26,8 @@ return """<b>This parameter is not used</b>"&quo
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <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.66">
+ <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>
@@ -99,24 +37,16 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <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>
+ <extensions/>
</scm>
<scriptPath>pipelines/backup/elasticsearch/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/ElasticsearchRestore/config.xml
index 24d88e8e2..76be767bb 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.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -33,69 +33,11 @@ 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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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>
@@ -104,24 +46,16 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <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>
+ <extensions/>
</scm>
<scriptPath>pipelines/backup/elasticsearch-restore/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml b/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml
deleted file mode 100644
index 70003b8d7..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/KeyRotation/config.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-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 1b83d545d..6822d1ba5 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,65 +13,10 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -81,15 +26,8 @@ return """<b>This parameter is not used</b>"&quo
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
- <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- <triggers>
- <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">
+ <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>
@@ -99,7 +37,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -119,4 +57,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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 8f35aafeb..a8fada98d 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.32">
+<flow-definition plugin="workflow-job@2.31">
<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.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
@@ -31,62 +31,9 @@
<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>
@@ -94,7 +41,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -104,7 +51,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>refs/tags/tag-for-backups</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -124,4 +71,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
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
deleted file mode 100644
index 35eabbf47..000000000
--- a/deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/KnowledgePlatform/jobs/RedisBackup/config.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-1</numToKeep>
- <artifactDaysToKeep>-1</artifactDaysToKeep>
- <artifactNumToKeep>5</artifactNumToKeep>
- </strategy>
- </jenkins.model.BuildDiscarderProperty>
- <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
- <autoRebuild>false</autoRebuild>
- <rebuildDisabled>false</rebuildDisabled>
- </com.sonyericsson.rebuild.RebuildSettings>
- <hudson.model.ParametersDefinitionProperty>
- <parameterDefinitions>
- <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 e5b5ea47c..68477b8ac 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.8">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.7">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.14"/>
+ <registry plugin="docker-commons@1.13"/>
</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>
+</com.cloudbees.hudson.plugins.folder.Folder>
\ No newline at end of file
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 d126cd51a..ff598501a 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,68 +13,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -82,7 +25,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -92,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -112,4 +55,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/JenkinsSlave/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/JenkinsSlave/config.xml
index de4e7c3c1..4e632379e 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=dimgray size=2><b>Provide the IP of Jenkins host.</b></font></description>
+ <description><font color=black 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>
+</flow-definition>
\ No newline at end of file
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 77f8f0b4a..d78cd9a24 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,68 +13,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -82,7 +25,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -92,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>{branch_or_tag}</name>
+ <name>{public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -111,5 +54,5 @@ return """<b>This parameter is not used</b>"&quo
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>false</disabled>
-</flow-definition>
+ <disabled>true</disabled>
+</flow-definition>
\ No newline at end of file
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 69198f5fb..fcc171f96 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,68 +13,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -82,7 +25,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -92,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -102,7 +45,14 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>1</depth>
+ <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>
@@ -112,4 +62,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogElasticSearch/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/LogElasticSearch/config.xml
index 8833fd8d5..31388c031 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,76 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -91,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -101,7 +38,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -111,4 +47,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Logstash/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Logstash/config.xml
deleted file mode 100644
index 95778c7d7..000000000
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Logstash/config.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions/>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-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 bf512172c..3b3747b52 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,75 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -90,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -100,7 +38,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -110,4 +47,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/PostgresDbUpdate/config.xml
index b56709817..48928e45f 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,75 +13,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -90,7 +28,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -100,7 +38,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -110,4 +47,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Registry/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/Core/jobs/Registry/config.xml
index 7a4cd1955..0d74bd2f9 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,68 +13,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -82,7 +25,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -92,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -111,5 +54,5 @@ return """<b>This parameter is not used</b>"&quo
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>false</disabled>
-</flow-definition>
+ <disabled>true</disabled>
+</flow-definition>
\ No newline at end of file
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 102641d9f..cf7405297 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions/>
<description></description>
<keepDependencies>false</keepDependencies>
@@ -13,68 +13,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -82,7 +25,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -92,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -111,5 +54,5 @@ return """<b>This parameter is not used</b>"&quo
<lightweight>false</lightweight>
</definition>
<triggers/>
- <disabled>false</disabled>
-</flow-definition>
+ <disabled>true</disabled>
+</flow-definition>
\ No newline at end of file
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 5be56a4e0..68477b8ac 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.8">
+<com.cloudbees.hudson.plugins.folder.Folder plugin="cloudbees-folder@6.7">
<actions/>
<description></description>
<properties>
- <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.8">
+ <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.4.1">
<dockerLabel></dockerLabel>
- <registry plugin="docker-commons@1.14"/>
+ <registry plugin="docker-commons@1.13"/>
</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 721ce4b62..daeb780bb 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,75 +20,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -97,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -107,7 +45,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -117,4 +54,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSecor/config.xml
index c20e767a0..a0de40ab9 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -19,75 +19,13 @@
<artifactNumToKeep>5</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -96,7 +34,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -106,7 +44,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -116,4 +53,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/AnalyticsSpark/config.xml
index 24dcad973..9aea1868e 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,75 +20,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -97,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -107,7 +45,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -117,4 +54,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Cassandra/config.xml
index 3ddc48990..abfcd287f 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,75 +20,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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>
@@ -97,24 +35,16 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <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>
+ <extensions/>
</scm>
<scriptPath>pipelines/provision/cassandra/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/InfluxDB/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/InfluxDB/config.xml
index e0d7d7981..d3dcbb10b 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -19,75 +19,13 @@
<artifactNumToKeep>5</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -96,7 +34,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -106,7 +44,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -116,4 +53,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kafka/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kafka/config.xml
index 2a3eca761..6d92ec2f4 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,68 +20,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -89,7 +32,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -99,7 +42,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -119,4 +62,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kibana/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Kibana/config.xml
index cac92eae5..38316772f 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,75 +20,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -97,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -107,7 +45,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -117,4 +54,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
deleted file mode 100644
index 445d922aa..000000000
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/MLWorkbench/config.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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 bfed6405d..33e61fb3d 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -19,75 +19,13 @@
<artifactNumToKeep>5</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -96,7 +34,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -106,7 +44,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -116,4 +53,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Redis_Cluster/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Redis_Cluster/config.xml
deleted file mode 100644
index b9b5b38d1..000000000
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Redis_Cluster/config.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-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 d8fa81c34..b51b86935 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,68 +20,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -89,7 +32,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -99,7 +42,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -114,9 +57,9 @@ return """<b>This parameter is not used</b>"&quo
</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>
+</flow-definition>
\ No newline at end of file
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 a36f5c0d7..9bf7797e3 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,75 +20,13 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -97,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -107,7 +45,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -117,4 +54,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Zookeeper/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/DataPipeline/jobs/Zookeeper/config.xml
index 06a3e4ee5..a8b9cceb7 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -19,68 +19,11 @@
<artifactNumToKeep>5</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -88,7 +31,7 @@ return """<b>This parameter is not used</b>"&quo
<paramsToUseForLimit></paramsToUseForLimit>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -98,7 +41,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -118,4 +61,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Cassandra/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Cassandra/config.xml
index dbf93f659..a9a247e8d 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,77 +20,15 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
+ <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>
@@ -100,7 +38,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -120,4 +58,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/CompositeSearch/config.xml
index 176104383..360f4f174 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,77 +20,15 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
+ <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>
@@ -100,7 +38,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -108,7 +46,7 @@ return """<b>This parameter is not used</b>"&quo
<extensions>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
- <noTags>false</noTags>
+ <noTags>true</noTags>
<reference></reference>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
@@ -120,4 +58,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Kafka/config.xml
index ec96033a3..93354ef4c 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,77 +20,15 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
+ <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>
@@ -100,7 +38,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -120,4 +58,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Learning/config.xml
index 9eb3a8c0b..bb374f354 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,68 +20,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -92,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -102,7 +45,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -122,4 +65,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Neo4j/config.xml
index bb4e62b0c..68a62ccf6 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,78 +20,16 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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>
@@ -100,7 +38,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -120,4 +58,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis/config.xml
index 758bcb5bb..cf7e9a532 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,78 +20,16 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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>
@@ -100,7 +38,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -120,4 +58,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis_Cluster/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis_Cluster/config.xml
deleted file mode 100644
index b9b5b38d1..000000000
--- a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Redis_Cluster/config.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<flow-definition plugin="workflow-job@2.32">
- <actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
- <jobPropertyDescriptors>
- <string>hudson.model.ParametersDefinitionProperty</string>
- <string>com.sonyericsson.rebuild.RebuildSettings</string>
- </jobPropertyDescriptors>
- </org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
- </actions>
- <description></description>
- <keepDependencies>false</keepDependencies>
- <properties>
- <jenkins.model.BuildDiscarderProperty>
- <strategy class="hudson.tasks.LogRotator">
- <daysToKeep>-1</daysToKeep>
- <numToKeep>-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 1865d82b1..064d2fb01 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,78 +20,16 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
- <scm class="hudson.plugins.git.GitSCM" plugin="git@3.9.3">
+ <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">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
@@ -100,7 +38,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -110,7 +48,6 @@ return """<b>This parameter is not used</b>"&quo
<shallow>true</shallow>
<noTags>false</noTags>
<reference></reference>
- <depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
@@ -120,4 +57,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Yarn/config.xml
index acdf2ac7f..fe08c83f0 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,68 +20,11 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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>
@@ -92,7 +35,7 @@ return """<b>This parameter is not used</b>"&quo
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
- <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.66">
+ <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>
@@ -102,7 +45,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -122,4 +65,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml b/deploy/jenkins/jobs/Provision/jobs/dev/jobs/KnowledgePlatform/jobs/Zookeeper/config.xml
index 740a853a8..7c89cde9d 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.32">
+<flow-definition plugin="workflow-job@2.31">
<actions>
- <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+ <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.20">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -20,77 +20,15 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.30">
+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.29">
<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.66">
+ <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>
@@ -100,7 +38,7 @@ return """<b>This parameter is not used</b>"&quo
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>${branch_or_tag}</name>
+ <name>${public_repo_branch}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
@@ -120,4 +58,4 @@ return """<b>This parameter is not used</b>"&quo
</definition>
<triggers/>
<disabled>false</disabled>
-</flow-definition>
+</flow-definition>
\ No newline at end of file
diff --git a/deploy/jenkins/plugins.txt b/deploy/jenkins/plugins.txt
index c4d12f3b5..0aa9413aa 100644
--- a/deploy/jenkins/plugins.txt
+++ b/deploy/jenkins/plugins.txt
@@ -1,120 +1,99 @@
junit@1.27
-workflow-basic-steps@2.15
-variant@1.2
+workflow-basic-steps@2.14
uno-choice@2.1
workflow-step-api@2.19
-simple-theme-plugin@0.5.1
-pam-auth@1.5
+pam-auth@1.4
jsch@0.1.55
-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
+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
pipeline-github-lib@1.0
-jacoco@3.0.4
ws-cleanup@0.37
-pipeline-build-step@2.9
+pipeline-build-step@2.7
conditional-buildstep@1.3.6
durable-task@1.29
-pipeline-model-extensions@1.3.8
+pipeline-model-extensions@1.3.4.1
jquery-ui@1.0.2
htmlpublisher@1.18
greenballs@1.15
-workflow-cps@2.67
-config-file-provider@3.6
-preSCMbuildstep@0.3
+workflow-cps@2.63
ssh-agent@1.17
-display-url-api@2.3.1
+display-url-api@2.3.0
structs@1.17
workflow-api@2.33
build-pipeline-plugin@1.5.8
ansicolor@0.6.2
-ssh-credentials@1.15
+ssh-credentials@1.14
pipeline-milestone-step@1.3.1
pipeline-graph-analysis@1.9
-token-macro@2.7
-blueocean-core-js@1.16.0
+token-macro@2.6
github@1.29.4
thinBackup@1.9
github-api@1.95
ldap@1.20
pipeline-model-declarative-agent@1.1.1
-gradle@1.31
-blueocean-pipeline-editor@1.16.0
+gradle@1.30
plain-credentials@1.5
workflow-support@3.2
-pipeline-model-definition@1.3.8
+pipeline-model-definition@1.3.4.1
matrix-auth@2.3
run-condition@1.2
windows-slaves@1.4
-build-name-setter@1.7.1
+build-name-setter@1.7.0
jquery@1.12.4-0
-active-directory@2.13
-script-security@1.58
+active-directory@2.12
+script-security@1.53
credentials@2.1.18
-copyartifact@1.42
+copyartifact@1.41
throttle-concurrents@2.0.1
-workflow-multibranch@2.21
+workflow-multibranch@2.20
ant@1.9
-branch-api@2.4.0
-email-ext@2.66
+branch-api@2.1.2
+email-ext@2.63
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.11
+pipeline-stage-view@2.10
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.18
-docker-workflow@1.18
+credentials-binding@1.17
+docker-workflow@1.17
ace-editor@1.1
-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
+workflow-job@2.31
+scm-api@2.3.0
bouncycastle-api@2.17
authentication-tokens@1.3
-jenkins-design-language@1.16.0
-jobConfigHistory@2.20
-pipeline-input-step@2.10
-javadoc@1.5
+jobConfigHistory@2.19
+pipeline-input-step@2.9
+javadoc@1.4
pipeline-stage-step@2.3
mailer@1.23
-git-parameter@0.9.10
-code-coverage-api@1.0.9
+code-coverage-api@1.0.7
handlebars@1.1.1
-blueocean-pipeline-api-impl@1.16.0
git-server@1.7
-pipeline-multibranch-defaults@2.0
-git-client@2.7.7
-blueocean-pipeline-scm-api@1.16.0
+git-client@2.7.6
command-launcher@1.3
resource-disposer@0.12
-rebuild@1.30
+rebuild@1.29
jquery-detached@1.2.1
build-timeout@1.19
workflow-aggregator@2.6
external-monitor-job@1.7
timestamper@1.9
-cloudbees-folder@6.8
+cloudbees-folder@6.7
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
-blueocean-commons@1.16.0
-pipeline-stage-tags-metadata@1.3.8
-pubsub-light@1.12
+pipeline-stage-tags-metadata@1.3.4.1
+jacoco@3.0.4
--
GitLab