UNCLASSIFIED

Skip to content

GitLab

Commit 05d95bbd authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch '2.249.1.2' into 'development' 

2.249.1.2

See merge request !29
parents 6cbfea8e 5594c063
Pipeline #41152 passed with stage
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 25 deletions
Dockerfile
View file @ 05d95bbd
...@@ -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=578ba7dd71a9cad51049e8b57f3efa461511d9fe
LABEL version=2.235.5.1 LABEL version=2.249.1.2
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."
Jenkinsfile
View file @ 05d95bbd
@Library('DCCSCR@master') _ @Library('DCCSCR@master') _
dccscrPipeline(version: '2.235.5.1') dccscrPipeline(version: '2.249.1.2')
README.md
View file @ 05d95bbd
# 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.249.1.2`
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.249.1.2
Master: Master:
Image: Image:
dockerImage: your-registry/core-mm:2.235.5.1 dockerImage: your-registry/core-mm:2.249.1.2
Agents: Agents:
Image: Image:
dockerImage: your-registry/agent:2.235.5.1 dockerImage: your-registry/agent:2.249.1.2
``` ```
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 @ 05d95bbd
{ {
"resources": [ "resources": [
{ {
"url": "https://dsop.s3.amazonaws.com/core-oc-files-450b795bdf21a1cd5dbb765af0ffee3e05d672ce16d3447030d061cc5c4c3455.tar", "url": "https://downloads.cloudbees.com/dsop-files/core-oc-files-89f86c15ad29c7a4199c0207373d405f7b93c331bdedd0944edc642f637dac99.tar",
"filename": "files.tar", "filename": "files.tar",
"validation": { "validation": {
"type": "sha256", "type": "sha256",
"value": "450b795bdf21a1cd5dbb765af0ffee3e05d672ce16d3447030d061cc5c4c3455" "value": "89f86c15ad29c7a4199c0207373d405f7b93c331bdedd0944edc642f637dac99"
} }
} }
] ]
......
helm/Chart.yaml
View file @ 05d95bbd
apiVersion: v1 apiVersion: v1
appVersion: 2.235.5.1 appVersion: 2.249.1.2
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.20.0-DEVELOPMENT
helm/requirements.lock
View file @ 05d95bbd
...@@ -4,6 +4,6 @@ dependencies: ...@@ -4,6 +4,6 @@ dependencies:
version: 1.40.2 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.6
digest: sha256:098216686eb47f2fc4126babeebc62d9f243af905dd304a8c43bf922689e93d5 digest: sha256:d030d7cde88b3247e6924bbd0dd3c00e5708edbe6fae2bdba9ed7eaa9ca2cc24
generated: "2020-07-08T15:03:31.071138-04:00" generated: "2020-09-10T06:07:30.330950229Z"
helm/requirements.yaml
View file @ 05d95bbd
...@@ -4,6 +4,6 @@ dependencies: ...@@ -4,6 +4,6 @@ dependencies:
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
version: 2.0.5 version: 2.0.6
repository: https://charts.cloudbees.com/public/cloudbees repository: https://charts.cloudbees.com/public/cloudbees
condition: sidecarinjector.Enabled condition: sidecarinjector.Enabled
helm/templates/_helpers.tpl
View file @ 05d95bbd
...@@ -14,7 +14,7 @@ Create chart name and version as used by the chart label. ...@@ -14,7 +14,7 @@ Create chart name and version as used by the chart label.
{{- end -}} {{- end -}}
{{- define "mm.longname" -}} {{- define "mm.longname" -}}
CloudBees Core - Managed Master - {{ include "mm.longname-suffix" .}} CloudBees CI - Managed Master - {{ include "mm.longname-suffix" .}}
{{- end -}} {{- end -}}
{{/* {{/*
......
helm/values.yaml
View file @ 05d95bbd
...@@ -32,7 +32,7 @@ OperationsCenter: ...@@ -32,7 +32,7 @@ OperationsCenter:
# Operations Center docker image # Operations Center docker image
Image: Image:
dockerImage: dcar/core-oc:2.235.5.1 dockerImage: dcar/core-oc:2.249.1.2
dockerPullPolicy: IfNotPresent dockerPullPolicy: IfNotPresent
# Image pull secrets # Image pull secrets
...@@ -215,7 +215,7 @@ Master: ...@@ -215,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.5.1 dockerImage: dcar/core-mm:2.249.1.2
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 +233,7 @@ Agents: ...@@ -233,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.5.1 dockerImage: dcar/agent:2.249.1.2
Persistence: Persistence:
## Persistent Volume Storage Class for Jenkins Home ## Persistent Volume Storage Class for Jenkins Home
......
scripts/usr/local/bin/jenkins.sh
View file @ 05d95bbd
...@@ -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=578ba7dd71a9cad51049e8b57f3efa461511d9fe /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: SUCCESS
    Branch: development

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

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