Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge release-6.0.0 to 7.0.0 #3997

Closed
wants to merge 41 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
408c8c4
Fix syntax (#3894)
santhosh-tg Sep 14, 2023
d6c6875
Updated vars for cron schedule (#3895)
raghupathiguduri Sep 19, 2023
8dc81f6
[ED-2793] Fix: release-6.0.0 installation issues (#3900)
santhosh-tg Sep 25, 2023
6320664
Update main.yml with cassandra (#3845) (#3901)
santhosh-tg Sep 25, 2023
6ce00cf
ED-2838: ##Release-6.0.0 new variables (#3899)
tsprasath Sep 26, 2023
3924727
[ED-2793] Fix installation issues (#3905)
santhosh-tg Sep 29, 2023
bf876cc
[ED-2793] Add OCI specific vars (#3912)
santhosh-tg Oct 27, 2023
d8d4479
Add ml_core_internal_access_token for private repo template
aks30 Nov 3, 2023
2101224
Merge pull request #3918 from aks30/patch-9
santhosh-tg Nov 3, 2023
22eaac2
Update cassandra jenkins job config (#3927)
santhosh-tg Nov 30, 2023
b8d7b88
saving changes (#3935)
ankit1shahu Dec 11, 2023
7c59bce
#OB-553 fix: Analytics service issue fixes for OCI
sowmya-dixit Feb 14, 2024
5af4495
#OB-553 fix: Analytics service issue fixes for OCI
sowmya-dixit Feb 15, 2024
3fb0c3e
ED-3534:- Adoption Changes in ML service (#3963)
ankit1shahu Feb 20, 2024
0d2daa4
ED-3079: deploy nginx to support cors for s3 compatible object storag…
ddevadat Feb 28, 2024
eb6d21a
Added new kafka topics in main.yml and config.j2 (#3970)
prashanthShiksha Feb 28, 2024
463de74
Issue #CO-824: dynamic redirect URL
Mar 13, 2024
856963b
Issue #CO-824: dynamic redirect URL
Mar 14, 2024
cc13e08
Issue #CO-824: SSO Isse condition update
Mar 15, 2024
6c55e1a
Merge pull request #3972 from shubhambansaltarento/bug/CO-CO-824
santhosh-tg Mar 15, 2024
e647be6
Merge pull request #3961 from sowmya-dixit/release-6.0.0
santhosh-tg Mar 28, 2024
bd77480
Issue ED-0000 report service env update
rajeevsathish Apr 2, 2024
c474dce
Issue ED-0000 report service env update (#3977)
rajeevsathish Apr 2, 2024
1e2d9ed
Issue ED-0000 report service env update
rajeevsathish Apr 3, 2024
d4b852e
Issue ED-0000 report service env update
rajeevsathish Apr 3, 2024
bdccf0e
Merge pull request #3979 from rajeevsathish/6.0.0
santhosh-tg Apr 3, 2024
ac243f7
Issue ED-0000 report service env update (#3981)
rajeevsathish Apr 4, 2024
7183cce
ED-3534:- Adoption Changes in ML service (#3983)
Vivek-M-08 Apr 15, 2024
d14902b
Issue #IQ-750 fix: added script for inquiry schema upload
krgauraw Apr 15, 2024
e0169de
Merge pull request #3985 from krgauraw/release-6.0.0
santhosh-tg Apr 15, 2024
890d5a8
Issue #IQ-750 fix: updated jenkins file
krgauraw Apr 15, 2024
ce7f1e7
Merge pull request #3986 from krgauraw/release-6.0.0
santhosh-tg Apr 15, 2024
9d27bff
added the faust related changes
Apr 16, 2024
17fcae4
Issue #IQ-750 fix: updated jenkins script
krgauraw Apr 16, 2024
669e9b5
Merge pull request #3987 from krgauraw/release-6.0.0
santhosh-tg Apr 16, 2024
4a20409
added the value to ml_analytics_faust_applications_list
Apr 16, 2024
b65d398
Update secrets.yml
ankit1shahu Apr 17, 2024
70c69d1
Merge pull request #3988 from Vivek-M-08/release-6.0.0
santhosh-tg Apr 17, 2024
b4a3248
Merge pull request #3990 from ankitpws/patch-1
santhosh-tg Apr 17, 2024
06cc35a
ED-3534:- Adoption Changes in ML service (#3993)
Vivek-M-08 Apr 19, 2024
7e703a9
Add release-6.0.0 missing vars (#3995)
santhosh-tg May 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[ED-2793] Fix installation issues (#3905)
* Update maven repo url

* Add missing jobs

* Fix docker creds secrets issue when having specialcharacters
  • Loading branch information
santhosh-tg authored Sep 29, 2023
commit 3924727585f9d0dd57ffad12ec447d7d3b750ae4
2 changes: 1 addition & 1 deletion deploy/jenkins/jenkins-server-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ rm openjdk-11.0.2_linux-x64_bin.tar.gz

#Install maven 3.6.3
echo -e "\n\e[0;32m${bold}Installating maven 3.6.3${normal}"
wget https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
wget https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
tar -xf apache-maven-3.6.3-bin.tar.gz
mv apache-maven-3.6.3 /opt/
mv /opt/apache-maven-3.6.3/bin/mvn /opt/apache-maven-3.6.3/bin/mvn3.6
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.23">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
<description/>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
<strategy class="hudson.tasks.LogRotator">
<daysToKeep>-1</daysToKeep>
<numToKeep>10</numToKeep>
<artifactDaysToKeep>-1</artifactDaysToKeep>
<artifactNumToKeep>1</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
<com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.32">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>absolute_job_path</name>
<description>&lt;font color=dimgray size=2&gt;&lt;b&gt;Do not change this value! The metadata.json will be copied from this job.&lt;/b&gt;&lt;/font&gt;</description>
<defaultValue>Build/KnowledgePlatform/InquiryFlinkJob</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>image_tag</name>
<description>&lt;font color=darkgreen size=2&gt;&lt;b&gt;OPTIONAL: Specify the tag to upload a specific image version to the container registry.&lt;/b&gt;&lt;/font&gt;</description>
<defaultValue/>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>artifact_source</name>
<description>&lt;font color=dimgray size=2&gt;&lt;b&gt;
ArtifactRepo - Push the docker image to container registry.
&lt;/b&gt;&lt;/font&gt;</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.2">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit/>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>

<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<jenkins.triggers.ReverseBuildTrigger>
<spec/>
<upstreamProjects>Build/KnowledgePlatform/InquiryFlinkJob</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.90">
<scm class="hudson.plugins.git.GitSCM" plugin="git@4.7.1">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<url>https://github.com/Sunbird-inQuiry/data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
<name>${inquiry_pipeline_branch_or_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="empty-list"/>
<extensions>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<noTags>false</noTags>
<reference/>
<depth>0</depth>
<honorRefspec>false</honorRefspec>
</hudson.plugins.git.extensions.impl.CloneOption>
</extensions>
</scm>
<scriptPath>kubernetes/pipelines/upload/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
<disabled>false</disabled>
</flow-definition>
55 changes: 37 additions & 18 deletions deploy/jenkins/jobs/Build/jobs/Core/jobs/Assessment/config.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.22">
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.23">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
Expand All @@ -19,26 +19,47 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
<com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
<com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.32">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>github_release_tag</name>
<name>inquiry_release_tag</name>
<description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
&lt;li&gt;The default value of ${public_repo_branch} will be the release / tag version set in global configuration&lt;/li&gt;
&lt;li&gt;To build from a differnt branch, replace the ${public_repo_branch} with your branch&lt;/li&gt;
&lt;li&gt;The default value of ${inquiry_service_build_branch_or_tag} will be the release / tag version set in global configuration&lt;/li&gt;
&lt;li&gt;To build from a differnt branch, replace the ${inquiry_service_build_branch_or_tag} with your branch&lt;/li&gt;
&lt;/b&gt;&lt;/font&gt;</description>
<defaultValue>refs/heads/${public_repo_branch}</defaultValue>
<defaultValue>refs/heads/${inquiry_service_build_branch_or_tag}</defaultValue>
<trim>true</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>core_release_tag</name>
<description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
&lt;li&gt;Provide this value to build core components from Knowlg BB&lt;/li&gt;
&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
&lt;li&gt;The default value of ${inquiry_core_build_branch_or_tag} will be the release / tag version set in global configuration&lt;/li&gt;
&lt;li&gt;To build from a differnt branch, replace the ${inquiry_core_build_branch_or_tag} with your branch&lt;/li&gt;
&lt;/b&gt;&lt;/font&gt;</description>
<defaultValue>refs/heads/${inquiry_core_build_branch_or_tag}</defaultValue>
<trim>false</trim>
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
<name>core_repo_link</name>
<description>Knowlg Core Repo</description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>https://github.com/project-sunbird/knowledge-platform.git</string>
</a>
</choices>
</hudson.model.ChoiceParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.3">
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.2">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
Expand All @@ -49,31 +70,29 @@
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>

<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<hudson.triggers.SCMTrigger>
<spec>H/15 * * * *</spec>
<ignorePostCommitHooks>false</ignorePostCommitHooks>
</hudson.triggers.SCMTrigger>
</triggers>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.87">
<scm class="hudson.plugins.git.GitSCM" plugin="git@4.5.0">
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.90">
<scm class="hudson.plugins.git.GitSCM" plugin="git@4.7.1">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<url>https://github.com/project-sunbird/knowledge-platform.git</url>
<url>https://github.com/Sunbird-inQuiry/inquiry-api-service.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
<name>${github_release_tag}</name>
<name>${inquiry_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="empty-list"/>
<extensions/>
</scm>
<scriptPath>build/assessment-service/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
<disabled>false</disabled>
</flow-definition>
</flow-definition>
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
<actions>
<org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.23">
<jobPropertyDescriptors>
<string>hudson.model.ParametersDefinitionProperty</string>
<string>com.sonyericsson.rebuild.RebuildSettings</string>
</jobPropertyDescriptors>
</org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction>
</actions>
<description/>
<keepDependencies>false</keepDependencies>
<properties>
<jenkins.model.BuildDiscarderProperty>
<strategy class="hudson.tasks.LogRotator">
<daysToKeep>-1</daysToKeep>
<numToKeep>10</numToKeep>
<artifactDaysToKeep>-1</artifactDaysToKeep>
<artifactNumToKeep>1</artifactNumToKeep>
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
<com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.32">
<autoRebuild>false</autoRebuild>
<rebuildDisabled>false</rebuildDisabled>
</com.sonyericsson.rebuild.RebuildSettings>
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
<name>inquiry_release_tag</name>
<description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;
&lt;li&gt;To build from a tag, use refs/tags/github_tag&lt;/li&gt;
&lt;li&gt;To build from a branch, use refs/heads/github_branch&lt;/li&gt;
&lt;li&gt;The default value of ${inquiry_pipeline_branch_or_tag} will be the release / tag version set in global configuration&lt;/li&gt;
&lt;li&gt;To build from a differnt branch, replace the ${inquiry_pipeline_branch_or_tag} with your branch&lt;/li&gt;
&lt;/b&gt;&lt;/font&gt;</description>
<defaultValue>refs/heads/${inquiry_pipeline_branch_or_tag}</defaultValue>
<trim>true</trim>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.2">
<maxConcurrentPerNode>0</maxConcurrentPerNode>
<maxConcurrentTotal>0</maxConcurrentTotal>
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
<throttleEnabled>false</throttleEnabled>
<throttleOption>project</throttleOption>
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
<paramsToUseForLimit/>
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>

<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers/>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.90">
<scm class="hudson.plugins.git.GitSCM" plugin="git@4.7.1">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<url>https://github.com/Sunbird-inQuiry/data-pipeline.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
<name>${inquiry_release_tag}</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="empty-list"/>
<extensions/>
</scm>
<scriptPath>kubernetes/pipelines/build/Jenkinsfile</scriptPath>
<lightweight>false</lightweight>
</definition>
<triggers/>
<disabled>false</disabled>
</flow-definition>
Loading
Loading