UNCLASSIFIED

Skip to content

GitLab

Commit d9133207 authored by Raul Arabaolaza's avatar Raul Arabaolaza
Browse files

2.235.5.1

parent b0b47013
Pipeline #35839 failed with stage
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 26 deletions
Dockerfile
View file @ d9133207
...@@ -42,8 +42,8 @@ HEALTHCHECK --interval=5m --timeout=3s \ ...@@ -42,8 +42,8 @@ HEALTHCHECK --interval=5m --timeout=3s \
CMD curl -fsL ${JENKINS_URL}/login || exit 1 CMD curl -fsL ${JENKINS_URL}/login || exit 1
LABEL securitytxt="https://www.cloudbees.com/.well-known/security.txt" LABEL securitytxt="https://www.cloudbees.com/.well-known/security.txt"
LABEL release=5e3361ef7dfaac2735ee3c330732700c0c0c10ff LABEL release=6364f6b188910521ce09b771cbafab433fdde0e3
LABEL version=2.235.2.3 LABEL version=2.235.5.1
ARG TARBALL=files.tar ARG TARBALL=files.tar
COPY ${TARBALL} /tmp COPY ${TARBALL} /tmp
......
Jenkinsfile
View file @ d9133207
@Library('DCCSCR@master') _ @Library('DCCSCR@master') _
dccscrPipeline(version: '2.235.2.3') dccscrPipeline(version: '2.235.5.1')
README.md
View file @ d9133207
...@@ -9,7 +9,7 @@ CloudBees Core consists of three Docker images installed via Helm chart: ...@@ -9,7 +9,7 @@ CloudBees Core consists of three Docker images installed via Helm chart:
For each image, all files other than UBI and native packages For each image, all files other than UBI and native packages
are included in a `files.tar` marked with a SHA-256 checksum. are included in a `files.tar` marked with a SHA-256 checksum.
A version of Core is given in the format `2.235.2.3` A version of Core is given in the format `2.235.5.1`
where the first three components are aligned with a Jenkins LTS. where the first three components are aligned with a Jenkins LTS.
The Helm chart is coversioned with `core-oc`. The Helm chart is coversioned with `core-oc`.
The `core-mm` image typically shares the same version, The `core-mm` image typically shares the same version,
...@@ -22,13 +22,13 @@ plus whatever other customizations are desired: ...@@ -22,13 +22,13 @@ plus whatever other customizations are desired:
```yaml ```yaml
OperationsCenter: OperationsCenter:
Image: Image:
dockerImage: your-registry/core-oc:2.235.2.3 dockerImage: your-registry/core-oc:2.235.5.1
Master: Master:
Image: Image:
dockerImage: your-registry/core-mm:2.235.2.3 dockerImage: your-registry/core-mm:2.235.5.1
Agents: Agents:
Image: Image:
dockerImage: your-registry/agent:2.235.2.3 dockerImage: your-registry/agent:2.235.5.1
``` ```
and [install via Helm 3](https://docs.cloudbees.com/docs/cloudbees-core/latest/kubernetes-install-guide/installing-kubernetes-using-helm) using the local copy of the chart: and [install via Helm 3](https://docs.cloudbees.com/docs/cloudbees-core/latest/kubernetes-install-guide/installing-kubernetes-using-helm) using the local copy of the chart:
......
download.json
View file @ d9133207
{ {
"resources": [ "resources": [
{ {
"url": "https://dsop.s3.amazonaws.com/core-oc-files-4c8b18ea379c4729e452fcc71b864dc7a06b96fd0b267863610c639c9208fad4.tar", "url": "https://dsop.s3.amazonaws.com/core-oc-files-450b795bdf21a1cd5dbb765af0ffee3e05d672ce16d3447030d061cc5c4c3455.tar",
"filename": "files.tar", "filename": "files.tar",
"validation": { "validation": {
"type": "sha256", "type": "sha256",
"value": "4c8b18ea379c4729e452fcc71b864dc7a06b96fd0b267863610c639c9208fad4" "value": "450b795bdf21a1cd5dbb765af0ffee3e05d672ce16d3447030d061cc5c4c3455"
} }
} }
] ]
......
helm/Chart.yaml
View file @ d9133207
apiVersion: v1 apiVersion: v1
appVersion: 2.235.2.3 appVersion: 2.235.5.1
description: The Continuous Delivery Solution for Enterprises description: The Continuous Delivery Solution for Enterprises
home: https://www.cloudbees.com/products/cloudbees-core home: https://www.cloudbees.com/products/cloudbees-core
icon: https://images.ctfassets.net/vtn4rfaw6n2j/7xprMMXARXDBuVxW4y8XfV/349fff91035050e3f2a8ff37bc0615b5/cloudbees-core-logo_header.svg icon: https://images.ctfassets.net/vtn4rfaw6n2j/7xprMMXARXDBuVxW4y8XfV/349fff91035050e3f2a8ff37bc0615b5/cloudbees-core-logo_header.svg
...@@ -7,4 +7,4 @@ keywords: ...@@ -7,4 +7,4 @@ keywords:
- cloudbees - cloudbees
- jenkins - jenkins
name: cloudbees-core name: cloudbees-core
version: 3.16.1-DEVELOPMENT version: 3.18.0-DEVELOPMENT
helm/requirements.lock
View file @ d9133207
dependencies: dependencies:
- name: nginx-ingress - name: nginx-ingress
repository: https://kubernetes-charts.storage.googleapis.com/ repository: https://kubernetes-charts.storage.googleapis.com/
version: 1.31.0 version: 1.40.2
- name: cloudbees-sidecar-injector - name: cloudbees-sidecar-injector
repository: https://charts.cloudbees.com/public/cloudbees repository: https://charts.cloudbees.com/public/cloudbees
version: 2.0.5 version: 2.0.5
digest: sha256:dcdcc490523e85471fbae554ad637a15d2581ffd192525b5a652c51177614201 digest: sha256:098216686eb47f2fc4126babeebc62d9f243af905dd304a8c43bf922689e93d5
generated: "2020-06-29T17:22:35.309549+02:00" generated: "2020-07-08T15:03:31.071138-04:00"
helm/requirements.yaml
View file @ d9133207
dependencies: dependencies:
- name: nginx-ingress - name: nginx-ingress
version: 1.31.0 version: 1.40.2
repository: https://kubernetes-charts.storage.googleapis.com/ repository: https://kubernetes-charts.storage.googleapis.com/
condition: nginx-ingress.Enabled condition: nginx-ingress.Enabled
- name: cloudbees-sidecar-injector - name: cloudbees-sidecar-injector
......
helm/templates/cjoc-statefulset.yaml
View file @ d9133207
...@@ -125,7 +125,6 @@ spec: ...@@ -125,7 +125,6 @@ spec:
# -Dcom.cloudbees.masterprovisioning.kubernetes.KubernetesMasterProvisioning.storageClassName=some-storage-class # -Dcom.cloudbees.masterprovisioning.kubernetes.KubernetesMasterProvisioning.storageClassName=some-storage-class
value: >- value: >-
-XshowSettings:vm -XshowSettings:vm
-Dhudson.DNSMultiCast.disabled=true
-Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle -Dhudson.lifecycle=hudson.lifecycle.ExitLifecycle
-Djenkins.model.Jenkins.slaveAgentPort={{ .Values.OperationsCenter.AgentListenerPort }} -Djenkins.model.Jenkins.slaveAgentPort={{ .Values.OperationsCenter.AgentListenerPort }}
-Djenkins.model.Jenkins.slaveAgentPortEnforce=true -Djenkins.model.Jenkins.slaveAgentPortEnforce=true
...@@ -152,6 +151,8 @@ spec: ...@@ -152,6 +151,8 @@ spec:
{{- if .Values.OperationsCenter.CSRF.ProxyCompatibility -}} {{- if .Values.OperationsCenter.CSRF.ProxyCompatibility -}}
-Djenkins.model.Jenkins.crumbIssuerProxyCompatibility=true -Djenkins.model.Jenkins.crumbIssuerProxyCompatibility=true
{{- end }} {{- end }}
-XX:+UseG1GC
-XX:+DisableExplicitGC
ports: ports:
- containerPort: {{ .Values.OperationsCenter.ContainerPort }} - containerPort: {{ .Values.OperationsCenter.ContainerPort }}
name: http name: http
......
helm/values.yaml
View file @ d9133207
...@@ -3,20 +3,19 @@ ...@@ -3,20 +3,19 @@
# Declare variables to be passed into your templates. # Declare variables to be passed into your templates.
# Installs the nginx ingress controller (optional) # Installs the nginx ingress controller (optional)
# Only enable this section if you don't have an existing installation of nginx-ingress controller # Enable this section if you don't have an existing installation of nginx-ingress controller
# NOTE: The controller.nodeSelector and defaultBackend.nodeSelector keys "beta.kubernetes.io/os" will need to change to # Note: use `beta.kubernetes.io/os` when deploying on Kubernetes versions below 1.16
# "kubernetes.io/os" to work with Kubernetes versions 1.18 or higher.
nginx-ingress: nginx-ingress:
Enabled: false Enabled: false
controller: controller:
ingressClass: nginx ingressClass: nginx
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
service: service:
externalTrafficPolicy: Local externalTrafficPolicy: Local
defaultBackend: defaultBackend:
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux kubernetes.io/os: linux
# Sidecar injector (optional) # Sidecar injector (optional)
# Useful when running infrastructure (GitHub Enterprise, Nexus, etc.) using a self-signed certificate. # Useful when running infrastructure (GitHub Enterprise, Nexus, etc.) using a self-signed certificate.
...@@ -33,9 +32,14 @@ OperationsCenter: ...@@ -33,9 +32,14 @@ OperationsCenter:
# Operations Center docker image # Operations Center docker image
Image: Image:
dockerImage: dcar/core-oc:2.235.2.3 dockerImage: dcar/core-oc:2.235.5.1
dockerPullPolicy: IfNotPresent dockerPullPolicy: IfNotPresent
# Image pull secrets
# Enable this option when using a private registry.
# https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-secret-by-providing-credentials-on-the-command-line
# ImagePullSecrets: my-k8s-secret
# Platform enables specific settings, option defaults standard # Platform enables specific settings, option defaults standard
# platform specific values are: eks, aws, gke, aks, pks, openshift, openshift4 # platform specific values are: eks, aws, gke, aks, pks, openshift, openshift4
# Note: openshift maps to OpenShift 3.x # Note: openshift maps to OpenShift 3.x
...@@ -124,7 +128,7 @@ OperationsCenter: ...@@ -124,7 +128,7 @@ OperationsCenter:
ProxyCompatibility: false ProxyCompatibility: false
# Only used when ServiceType: LoadBalancer # Only used when ServiceType: LoadBalancer
# https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service # https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer
LoadBalancerSourceRanges: LoadBalancerSourceRanges:
- 0.0.0.0/0 - 0.0.0.0/0
# Optionally assign a known public LB IP # Optionally assign a known public LB IP
...@@ -211,7 +215,7 @@ Master: ...@@ -211,7 +215,7 @@ Master:
# Docker image inserted in Operations Center automatically # Docker image inserted in Operations Center automatically
Image: Image:
dockerImage: dcar/core-mm:2.235.2.3 dockerImage: dcar/core-mm:2.235.5.1
dockerPullPolicy: IfNotPresent dockerPullPolicy: IfNotPresent
# Additional Java options to pass to managed masters. For example, setting up a JMX port # Additional Java options to pass to managed masters. For example, setting up a JMX port
JavaOpts: null JavaOpts: null
...@@ -229,7 +233,7 @@ Agents: ...@@ -229,7 +233,7 @@ Agents:
Create: false Create: false
Image: Image:
# Used to override the default docker image used for agents # Used to override the default docker image used for agents
dockerImage: dcar/agent:2.235.2.3 dockerImage: dcar/agent:2.235.5.1
Persistence: Persistence:
## Persistent Volume Storage Class for Jenkins Home ## Persistent Volume Storage Class for Jenkins Home
......
scripts/usr/local/bin/jenkins.sh
View file @ d9133207
...@@ -52,7 +52,7 @@ find /usr/share/jenkins/ref/ -type f -exec bash -c "copy_reference_file '{}'" \; ...@@ -52,7 +52,7 @@ find /usr/share/jenkins/ref/ -type f -exec bash -c "copy_reference_file '{}'" \;
# if `docker run` first argument start with `--` the user is passing jenkins launcher arguments # if `docker run` first argument start with `--` the user is passing jenkins launcher arguments
if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=5e3361ef7dfaac2735ee3c330732700c0c0c10ff /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\"" eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=6364f6b188910521ce09b771cbafab433fdde0e3 /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\""
fi fi
# As argument is not jenkins, assume user want to run his own process, for sample a `bash` shell to explore this image # As argument is not jenkins, assume user want to run his own process, for sample a `bash` shell to explore this image
......
  • jenkins-gitlab @jenkins-gitlab ·

    Pipeline Status: FAILURE
    FAILURE Stage: Whitelist Compare Lint
    Branch: 2.235.5.1

    graph LR
  0([setup]):::INTERNAL_FAILURE --> 3([Import Artifacts]):::NOT_BUILT --> 4((/)):::INTERNAL_NOT_BUILT --> 5([Stage Artifacts]):::NOT_BUILT --> 6((/)):::INTERNAL_NOT_BUILT --> 7([Build]):::NOT_BUILT --> 8([Publish, Scan & Report]):::INTERNAL_FAILURE

classDef SUCCESS font-size:10px
classDef FAILURE fill:#f44, font-size:10px
classDef SKIPPED font-size:10px
classDef ABORTED fill:#889, font-size:10px
classDef INTERNAL_SUCCESS font-size:10px, stroke-dasharray: 2, 1
classDef INTERNAL_FAILURE fill:#f44, font-size:10px, stroke-dasharray: 2, 1
classDef INTERNAL_SKIPPED font-size:10px, stroke-dasharray: 2, 1
classDef INTERNAL_ABORTED fill:#889, font-size:10px, stroke-dasharray: 2, 1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED