Aligned prov-app config and fixed jenkins agent in configuration samp…

…le (#1260)
opendevstack · Jan 30, 2024 · 68834ed · 68834ed
1 parent 7b27d4b
commit 68834ed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Fixed
 - Aqua scanner and Helm deployment conflict fix for jenkins agent ([#1067](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1067))
+- Aligned Prov-app configuration, increasing the timeouts and fixed jenkins agent image in configuration sample ([#1259](https://github.com/opendevstack/ods-core/issues/1259))
 
 ## [4.3.0] - 2023-07-03
 

diff --git a/configuration-sample/ods-core.env.sample b/configuration-sample/ods-core.env.sample
@@ -208,7 +208,7 @@ JENKINS_MASTER_DOCKERFILE_PATH=Dockerfile.ubi8
 # - Available tags listed at: https://catalog.redhat.com/software/containers/openshift3/jenkins-slave-base-rhel7/581d2f3f00e5d05639b6515b.
 # - Example: registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7:v3.11
 # - Latest tested tag: v3.11.248 (v3.11 is a moving target)
-JENKINS_AGENT_BASE_FROM_IMAGE=registry.redhat.io/openshift4/ose-jenkins:v4.10.0-202305170515.p0.g2988625.assembly.stream
+JENKINS_AGENT_BASE_FROM_IMAGE=registry.redhat.io/openshift4/ose-jenkins-agent-base:v4.10.0-202305170515.p0.g2988625.assembly.stream
 
 # Dockerfile to use for Jenkins agents.
 # Use "Dockerfile.ubi8" for both OpenShift 3.11 and 4  (UBI8 base image)

diff --git a/ods-provisioning-app/ocp-config/cm.yml b/ods-provisioning-app/ocp-config/cm.yml
@@ -125,9 +125,9 @@ objects:
       logging.file.path=${PROV_APP_LOGGING_FILE_PATH}
 
       # atlassian API calls take sooo long
-      server.servlet.session.timeout=240
+      server.servlet.session.timeout=1200
       server.connection-timeout=90000
-      spring.session.timeout=240
+      spring.session.timeout=1200
       spring.mvc.async.request-timeout=90000
 
       frontend.spa.enabled=${PROV_APP_FRONT_SPA_ENABLED}