UNCLASSIFIED

Commit 25946616 authored by Ildefonso Montero's avatar Ildefonso Montero
Browse files

2.235.2.3

parent 6cbfea8e
Pipeline #38220 failed with stage
...@@ -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=6364f6b188910521ce09b771cbafab433fdde0e3 LABEL release=de251ed1df9dd7f5f828c18cfa9d4e51de5af0a7
LABEL version=2.235.5.1 LABEL version=2.235.2.3
ARG TARBALL=files.tar ARG TARBALL=files.tar
COPY ${TARBALL} /tmp COPY ${TARBALL} /tmp
...@@ -68,7 +68,7 @@ ENV VOLUME_SERVICE=http://localhost:31080 ...@@ -68,7 +68,7 @@ ENV VOLUME_SERVICE=http://localhost:31080
ENV TENANT=cjoc ENV TENANT=cjoc
ENV JENKINS_VARIANT=cjoc ENV JENKINS_VARIANT=cjoc
LABEL name="CloudBees Core Operation Center" \ LABEL name="CloudBees CI Operation Center" \
vendor="CloudBees, Inc." \ vendor="CloudBees, Inc." \
summary="CloudBees Core is the continuous delivery platform architected for the enterprise" \ summary="CloudBees CI is the continuous delivery platform architected for the enterprise" \
description="This container image will deploy one instance of CloudBees Core Operations Center." description="This container image will deploy one instance of CloudBees CI Operations Center."
@Library('DCCSCR@master') _ @Library('DCCSCR@master') _
dccscrPipeline(version: '2.235.5.1') dccscrPipeline(version: '2.235.2.3')
# CloudBees Core setup # CloudBees CI setup
CloudBees Core consists of three Docker images installed via Helm chart: CloudBees CI (formerly known as _CloudBees Core_) consists of three Docker images installed via Helm chart:
* `core-oc`: the Operations Center * `core-oc`: the Operations Center
* `core-mm`: a managed Jenkins master * `core-mm`: a managed Jenkins master
...@@ -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.5.1` A version of CloudBees CI is given in the format `2.235.2.3`
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.5.1 dockerImage: your-registry/core-oc:2.235.2.3
Master: Master:
Image: Image:
dockerImage: your-registry/core-mm:2.235.5.1 dockerImage: your-registry/core-mm:2.235.2.3
Agents: Agents:
Image: Image:
dockerImage: your-registry/agent:2.235.5.1 dockerImage: your-registry/agent:2.235.2.3
``` ```
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:
......
{ {
"resources": [ "resources": [
{ {
"url": "https://dsop.s3.amazonaws.com/core-oc-files-450b795bdf21a1cd5dbb765af0ffee3e05d672ce16d3447030d061cc5c4c3455.tar", "url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-9395c40fb87cf0d70ed2c166d5fcf84b18163c17123cd50ff62f2f5150a58561.tar",
"filename": "files.tar", "filename": "files.tar",
"validation": { "validation": {
"type": "sha256", "type": "sha256",
"value": "450b795bdf21a1cd5dbb765af0ffee3e05d672ce16d3447030d061cc5c4c3455" "value": "9395c40fb87cf0d70ed2c166d5fcf84b18163c17123cd50ff62f2f5150a58561"
} }
} }
] ]
......
apiVersion: v1 apiVersion: v1
appVersion: 2.235.5.1 appVersion: 2.235.2.3
description: The Continuous Delivery Solution for Enterprises description: The Continuous Delivery Solution for Enterprises
engine: gotpl
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
keywords: keywords:
- cloudbees - cloudbees
- jenkins - jenkins
name: cloudbees-core name: cloudbees-core
version: 3.18.0-DEVELOPMENT version: 3.16.1-DEVELOPMENT
dependencies: dependencies:
- name: nginx-ingress - name: nginx-ingress
repository: https://kubernetes-charts.storage.googleapis.com/ repository: https://kubernetes-charts.storage.googleapis.com/
version: 1.40.2 version: 1.31.0
- 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:098216686eb47f2fc4126babeebc62d9f243af905dd304a8c43bf922689e93d5 digest: sha256:fa8962ae6715016680597010462281d7e7622a9a54ef2fab053bbe5765601279
generated: "2020-07-08T15:03:31.071138-04:00" generated: "2020-08-28T07:03:51.382602619Z"
dependencies: dependencies:
- name: nginx-ingress - name: nginx-ingress
version: 1.40.2 version: 1.31.0
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
......
...@@ -125,6 +125,7 @@ spec: ...@@ -125,6 +125,7 @@ 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
...@@ -151,8 +152,6 @@ spec: ...@@ -151,8 +152,6 @@ 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
......
...@@ -3,19 +3,20 @@ ...@@ -3,19 +3,20 @@
# 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)
# Enable this section if you don't have an existing installation of nginx-ingress controller # Only enable this section if you don't have an existing installation of nginx-ingress controller
# Note: use `beta.kubernetes.io/os` when deploying on Kubernetes versions below 1.16 # NOTE: The controller.nodeSelector and defaultBackend.nodeSelector keys "beta.kubernetes.io/os" will need to change to
# "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:
kubernetes.io/os: linux beta.kubernetes.io/os: linux
service: service:
externalTrafficPolicy: Local externalTrafficPolicy: Local
defaultBackend: defaultBackend:
nodeSelector: nodeSelector:
kubernetes.io/os: linux beta.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.
...@@ -32,14 +33,9 @@ OperationsCenter: ...@@ -32,14 +33,9 @@ OperationsCenter:
# Operations Center docker image # Operations Center docker image
Image: Image:
dockerImage: dcar/core-oc:2.235.5.1 dockerImage: dcar/core-oc:2.235.2.3
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
...@@ -128,7 +124,7 @@ OperationsCenter: ...@@ -128,7 +124,7 @@ OperationsCenter:
ProxyCompatibility: false ProxyCompatibility: false
# Only used when ServiceType: LoadBalancer # Only used when ServiceType: LoadBalancer
# https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer # https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service
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
...@@ -215,7 +211,7 @@ Master: ...@@ -215,7 +211,7 @@ Master:
# Docker image inserted in Operations Center automatically # Docker image inserted in Operations Center automatically
Image: Image:
dockerImage: dcar/core-mm:2.235.5.1 dockerImage: dcar/core-mm:2.235.2.3
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
...@@ -233,7 +229,7 @@ Agents: ...@@ -233,7 +229,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.5.1 dockerImage: dcar/agent:2.235.2.3
Persistence: Persistence:
## Persistent Volume Storage Class for Jenkins Home ## Persistent Volume Storage Class for Jenkins Home
......
...@@ -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=6364f6b188910521ce09b771cbafab433fdde0e3 /usr/share/jenkins/jenkins.war $JENKINS_OPTS \"\$@\"" eval "exec java ${JAVA_OPTS:-} -jar -Dcb.distributable.name=\"Docker Common CJE\" -Dcb.distributable.commit_sha=de251ed1df9dd7f5f828c18cfa9d4e51de5af0a7 /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
......
  • Pipeline Status: FAILURE
    FAILURE Stage: Whitelist Compare Lint
    Branch: delete-me-only-for-test

    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