Merge pull request #470 from bcgov/grad-release

Grad release 1.16.0
bcgov · Mar 26, 2024 · 3a6ef37 · 3a6ef37
2 parents 006397b + d01a3ce
commit 3a6ef37
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/build.from.developer.branch.deploy.to.dev.yml b/.github/workflows/build.from.developer.branch.deploy.to.dev.yml
@@ -27,7 +27,7 @@ env:
   MAX_CPU: "300m"
   MIN_MEM: "1024Mi"
   MAX_MEM: "4Gi"
-  MIN_REPLICAS: "3"
+  MIN_REPLICAS: "2"
   MAX_REPLICAS: "3"
 
 on:

diff --git a/.github/workflows/build.from.main.branch.deploy.to.dev.yml b/.github/workflows/build.from.main.branch.deploy.to.dev.yml
@@ -27,7 +27,7 @@ env:
   MAX_CPU: "300m"
   MIN_MEM: "1024Mi"
   MAX_MEM: "4Gi"
-  MIN_REPLICAS: "3"
+  MIN_REPLICAS: "2"
   MAX_REPLICAS: "3"
 
 on:

diff --git a/.github/workflows/build.from.release.branch.deploy.to.dev.yml b/.github/workflows/build.from.release.branch.deploy.to.dev.yml
@@ -27,7 +27,7 @@ env:
   MAX_CPU: "300m"
   MIN_MEM: "1024Mi"
   MAX_MEM: "4Gi"
-  MIN_REPLICAS: "3"
+  MIN_REPLICAS: "2"
   MAX_REPLICAS: "3"
 
 on:

diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml
@@ -22,7 +22,7 @@ env:
   MIN_MEM: "1024Mi"
   MAX_MEM: "4Gi"
   MIN_REPLICAS: "3"
-  MAX_REPLICAS: "3"
+  MAX_REPLICAS: "4"
 
 
 on:

diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml
@@ -22,7 +22,7 @@ env:
   MIN_MEM: "1024Mi"
   MAX_MEM: "4Gi"
   MIN_REPLICAS: "3"
-  MAX_REPLICAS: "3"
+  MAX_REPLICAS: "4"
 
 
 on:

diff --git a/.gitignore b/.gitignore
@@ -52,4 +52,5 @@ target/
 build/
 
 ### VS Code ###
-.vscode/
+.vscode/
+api/application-local.yaml
diff --git a/api/pom.xml b/api/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ca.bc.gov.educ</groupId>
     <artifactId>educ-grad-batch-graduation-api</artifactId>
-    <version>1.8.58</version>
+    <version>1.8.59</version>
     <name>educ-grad-batch-graduation-api</name>
     <description>Ministry of Education GRAD BATCH GRADUATION API</description>
 

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/controller/JobLauncherController.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/controller/JobLauncherController.java
@@ -608,7 +608,7 @@ public ResponseEntity<SummaryDashBoard> loadSummary(@RequestParam(name = "pageNu
 
     @PostMapping(EducGradBatchGraduationApiConstants.EXECUTE_SPECIALIZED_USER_REQ_RUNS)
     @PreAuthorize(PermissionsConstants.RUN_GRAD_ALGORITHM)
-    @Operation(summary = "Run Specialized TVR Runs", description = "Run specialized Distribution runs", tags = { "DISTRIBUTION" })
+    @Operation(summary = "Run Specialized TVR Runs", description = "Run specialized Distribution runs", tags = { "Distribution" })
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK"),@ApiResponse(responseCode = "500", description = "Internal Server Error")})
     public ResponseEntity<DistributionSummaryDTO> launchUserReqDisRunSpecialJob(@PathVariable String credentialType, @RequestBody StudentSearchRequest studentSearchRequest) {
         logger.debug("launchUserReqDisRunSpecialJob");
@@ -645,7 +645,7 @@ public ResponseEntity<DistributionSummaryDTO> launchUserReqDisRunSpecialJob(@Pat
 
     @PostMapping(EducGradBatchGraduationApiConstants.EXECUTE_SPECIALIZED_BLANK_USER_REQ_RUNS)
     @PreAuthorize(PermissionsConstants.RUN_GRAD_ALGORITHM)
-    @Operation(summary = "Run Specialized User Req Runs", description = "Run specialized Distribution runs", tags = { "DISTRIBUTION" })
+    @Operation(summary = "Run Specialized User Req Runs", description = "Run specialized Distribution runs", tags = { "Distribution" })
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK"),@ApiResponse(responseCode = "500", description = "Internal Server Error")})
     public ResponseEntity<BlankDistributionSummaryDTO> launchUserReqBlankDisRunSpecialJob(@RequestBody BlankCredentialRequest blankCredentialRequest, @PathVariable String credentialType) {
         logger.debug("launchUserReqDisRunSpecialJob");

diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml
@@ -15,7 +15,7 @@ spring:
     password: ${PASSWORD}
     driver-class-name: oracle.jdbc.driver.OracleDriver
   jpa:
-    show-sql: true
+    show-sql: false
     database-platform: org.hibernate.dialect.OracleDialect
     hibernate:
       ddl-auto: none

diff --git a/tools/config/update-configmap.sh b/tools/config/update-configmap.sh
@@ -71,6 +71,7 @@ oc create -n "$OPENSHIFT_NAMESPACE"-"$envValue" configmap "$APP_NAME"-config-map
  --from-literal=NUMBER_OF_PARTITIONS="10" \
  --from-literal=KEYCLOAK_TOKEN_URL="https://soam-$envValue.apps.silver.devops.gov.bc.ca/" \
  --from-literal=REG_ALG_CRON="0 30 18 * * *" \
+ --from-literal=RECORDS_STALE_IN_DAYS="1095" \
  --dry-run=client -o yaml | oc apply -f -
 
 echo Creating config map "$APP_NAME"-flb-sc-config-map