Issue #LR-583 merge: release-5.4.0 to master (#587)

Sunbird-Lern · Oct 27, 2023 · 67d8534 · 67d8534
1 parent 8825ba1
commit 67d8534
Show file tree

Hide file tree

Showing 25 changed files with 9,031 additions and 117 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,7 +13,7 @@ jobs:
       - run:
           name: redis
           command: sudo apt install redis-server -y
-      - run: mvn clean install -DforkCount=1 -e
+      - run: mvn clean install -DCLOUD_STORE_GROUP_ID=$CLOUD_STORE_GROUP_ID -DCLOUD_STORE_ARTIFACT_ID=$CLOUD_STORE_ARTIFACT_ID -DCLOUD_STORE_VERSION=$CLOUD_STORE_VERSION
       - run: cd course-mw/enrolment-actor && mvn scoverage:report
       - run: cd course-mw/sunbird-util/cache-utils && mvn scoverage:report
       - run: cd service && mvn play2:dist

diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@ RUNNING_PID
 /.target/
 /bin/
 /logs
+**.vscode
diff --git a/Dockerfile.Build b/Dockerfile.Build
@@ -10,6 +10,6 @@ ENV  M2_HOME /opt/apache-maven-3.3.9
 ENV  PATH ${M2_HOME}/bin:${PATH}
 COPY learner /opt/learner/
 WORKDIR /opt/learner/services
-RUN mvn clean install -DskipTests
+RUN mvn clean install -DskipTests -DCLOUD_STORE_GROUP_ID=org.sunbird -DCLOUD_STORE_ARTIFACT_ID=cloud-store-sdk -DCLOUD_STORE_VERSION=1.4.6
 WORKDIR /opt/learner/services/learning-service
 CMD ["mvn", "play2:dist"]
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -25,7 +25,7 @@ node('build-slave') {
                     env.NODE_ENV = "build"
                     print "Environment will be : ${env.NODE_ENV}"
                     sh 'git log -1'
-                    sh 'mvn clean install -DskipTests=true '
+                    sh "mvn clean install -DskipTests=true -DCLOUD_STORE_GROUP_ID=${params.cloud_store_group_id} -DCLOUD_STORE_ARTIFACT_ID=${params.cloud_store_artifact_id} -DCLOUD_STORE_VERSION=${params.cloud_store_version}"
                 }
 
                 // stage('Unit Tests') {