Merge branch 'master' into feature/webhook-proxy

.github/workflows/continuous-integration-workflow.yml

@@ -8,18 +8,11 @@ on:
 jobs:
   jenkins-master:
     name: Jenkins master tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout repository
         uses: actions/checkout@v2.0.0
-      -
-        name: Build CENTOS docker image
-        run: |
-          ./.github/workflows/build-docker-image.sh \
-          --imagename ods-jenkins-master-centos7 \
-          --dockerdir jenkins/master \
-          --dockerfile Dockerfile.centos7
       -
         name: Build UBI8 docker image
         run: |
@@ -30,29 +23,11 @@ jobs:
 
   jenkins-agent-base:
     name: Jenkins agent base tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout repository
         uses: actions/checkout@v2.0.0
-      - name: Build CENTOS docker image
-        run: |
-          ./.github/workflows/build-docker-image.sh \
-          --imagename ods-jenkins-agent-base-centos7 \
-          --dockerdir jenkins/agent-base \
-          --dockerfile Dockerfile.centos7 \
-          --build-arg SNYK_DISTRIBUTION_URL="https://github.com/snyk/snyk/releases/download/v1.1097.0/snyk-linux"
-      - name: Push RHEL7 docker image
-        if: success() && github.repository == 'opendevstack/ods-core' && github.event_name == 'push'
-        shell: bash
-        env:
-          DOCKER_USER: ${{ secrets.DockerHubUser }}
-          DOCKER_PASS: ${{ secrets.DockerHubPass }}
-        run: |
-          ./.github/workflows/push-docker-image.sh \
-          --user "$DOCKER_USER" \
-          --password "$DOCKER_PASS" \
-          --imagename ods-jenkins-agent-base-centos7
       - name: Build UBI8 docker image
         run: |
           ./.github/workflows/build-docker-image.sh \
@@ -73,7 +48,7 @@ jobs:
           --imagename ods-jenkins-agent-base-ubi8
   sonarqube:
     name: SonarQube tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         version: ['8.9.10.61524'] # 8.9 = LTS
@@ -93,7 +68,7 @@ jobs:
 
   nexus:
     name: Nexus tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout repository
@@ -109,7 +84,7 @@ jobs:
 
   webhook-proxy:
     name: Webhook Proxy tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout repository
@@ -149,7 +124,7 @@ jobs:
 
   create-projects:
     name: Create Projects tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout repository
@@ -166,7 +141,7 @@ jobs:
 
   clone-check:
     name: Verify clone script requirements
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout repository
@@ -184,7 +159,7 @@ jobs:
 
   compile-go-tests:
     name: Verify Go tests are formatted and can be compiled
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       -
         name: Checkout repository
@@ -218,7 +193,7 @@ jobs:
 
 # cluster:
 #   name: Setup and project provisioning tests
-#   runs-on: ubuntu-16.04
+#   runs-on: ubuntu-22.04
 #   steps:
 #     -
 #       name: GitHub context

CHANGELOG.md

@@ -2,12 +2,18 @@
 
 ## Unreleased
 
+- Memory malloc arena fix for Jenkins ([#1217](https://github.com/opendevstack/ods-core/pull/1217))
+- Added webhook proxy feature to check for Jenkins availability ([#1221](https://github.com/opendevstack/ods-core/issues/1221))
+
+
+## [4.2.0] - 2023-02-21
+
 - Maintenance, update nexus to version 3.45.1 ([#1201](https://github.com/opendevstack/ods-core/pull/1201))
 - Update Containers Probes in Jenkins ([#1191](https://github.com/opendevstack/ods-core/issues/1191))
 - Upgrade SonarQube to version 8.9 LTS, removal of plugins that are now bundled ([#1075](https://github.com/opendevstack/ods-core/issues/1075))
 - Maintenance, update helm to version 3.11.0 and update deps ([#1203](https://github.com/opendevstack/ods-core/issues/1203))
 - Maintenance, update snyk to version 1.1097.0 ([#1203](https://github.com/opendevstack/ods-core/issues/1199))
-- Added webhook proxy feature to check for Jenkins availability ([#1221](https://github.com/opendevstack/ods-core/issues/1221))
+- Removal of Centos and deprecation of ODSBox ([#1209](https://github.com/opendevstack/ods-core/issues/1209))
 
 ## [4.1.1] - 2022-11-24
 

configuration-sample/ods-core.env.sample

@@ -191,17 +191,11 @@ CONFLUENCE_URL=http://192.168.56.31:8090
 # - Available tags listed at: https://catalog.redhat.com/software/containers/openshift3/jenkins-2-rhel7/581d2f4500e5d05639b6517b
 # - Example: registry.access.redhat.com/openshift3/jenkins-2-rhel7:v3.11
 # - Latest tested tag: v3.11.248 (v3.11 is a moving target)
-# For CENTOS7-based images (OpenShift 3.11):
-# - Available tags listed at: https://hub.docker.com/r/openshift/jenkins-2-centos7/tags
-# - Example: openshift/jenkins-2-centos7:v3.11 (Docker Hub is the default registry)
-# - Latest tested tag: v3.11 (v3.11 is a moving target, but more specific tags are not available)
-JENKINS_MASTER_BASE_FROM_IMAGE=openshift/jenkins-2-centos7:v3.11
+JENKINS_MASTER_BASE_FROM_IMAGE=registry.access.redhat.com/openshift3/jenkins-2-rhel7:v3.11
 
 # Dockerfile to use for Jenkins master.
-# Use "Dockerfile.centos7" for OpenShift 3.11 (CentOS7 base image)
-# Use "Dockerfile.rhel7" for OpenShift 3.11 (RHEL7 base image)
-# Use "Dockerfile.ubi8" for OpenShift 4 (UBI8 base image)
-JENKINS_MASTER_DOCKERFILE_PATH=Dockerfile.centos7
+# Use "Dockerfile.ubi8" for both OpenShift 3.11 and 4  (UBI8 base image)
+JENKINS_MASTER_DOCKERFILE_PATH=Dockerfile.ubi8
 
 # Base image for Jenkins agent base.
 # For UBI8-based images (OpenShift 4):
@@ -213,16 +207,11 @@ JENKINS_MASTER_DOCKERFILE_PATH=Dockerfile.centos7
 # - 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)
-# For CENTOS7-based images (OpenShift 3.11):
-# - Available tags listed at: https://hub.docker.com/r/openshift/jenkins-slave-base-centos7/tags
-# - Example: openshift/jenkins-slave-base-centos7:v3.11 (Docker Hub is the default registry)
-# - Latest tested tag: v3.11 (v3.11 is a moving target, but more specific tags are not available)
-JENKINS_AGENT_BASE_FROM_IMAGE=openshift/jenkins-slave-base-centos7:v3.11
+JENKINS_AGENT_BASE_FROM_IMAGE=registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7:v3.11
 
 # Dockerfile to use for Jenkins agents.
-# Use "Dockerfile.centos7" for OpenShift 3.11 (RHEL7/CentOS7 base image)
-# Use "Dockerfile.ubi8" for OpenShift 4 (UBI8 base image)
-JENKINS_AGENT_DOCKERFILE_PATH=Dockerfile.centos7
+# Use "Dockerfile.ubi8" for both OpenShift 3.11 and 4  (UBI8 base image)
+JENKINS_AGENT_DOCKERFILE_PATH=Dockerfile.ubi8
 
 # Snyk CLI binary distribution url
 # Leave empty to avoid installing Snyk.

jenkins/agent-base/Dockerfile.ubi8

@@ -10,7 +10,7 @@ ENV SONAR_SCANNER_VERSION=4.7.0.2747 \
     HELM_PLUGIN_DIFF_VERSION=3.6.0 \
     HELM_PLUGIN_SECRETS_VERSION=4.2.2 \
     GIT_LFS_VERSION=2.6.1 \
-    JNLP_JAVA_OPTIONS="-XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Dsun.zip.disableMemoryMapping=true"
+    JAVA_GC_OPTS="-XX:+UseParallelGC -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90"
 
 ARG APP_DNS
 ARG SNYK_DISTRIBUTION_URL