UNCLASSIFIED

Commit 261579bc authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master'

Development

See merge request !53
parents 260bf6f4 f6a8b292
Pipeline #292647 passed with stages
in 8 minutes and 8 seconds
...@@ -30,11 +30,11 @@ _Flow Server_ is the application server that orchestrates processes run across C ...@@ -30,11 +30,11 @@ _Flow Server_ is the application server that orchestrates processes run across C
+ +
_Intellectual Property Rights_ means any patents, patent rights, design rights, copyrights, database rights, trade secrets, know-how, trademarks, trade names, service marks and other intellectual property embodied therein and all applications and rights to apply for registration or protection rights pertaining thereto, in existence at the date hereof or created in the future. _Intellectual Property Rights_ means any patents, patent rights, design rights, copyrights, database rights, trade secrets, know-how, trademarks, trade names, service marks and other intellectual property embodied therein and all applications and rights to apply for registration or protection rights pertaining thereto, in existence at the date hereof or created in the future.
+ +
_Master_ means the central, coordinating process which stores configuration, loads plugins, and renders the various user interfaces for Jenkins. _Controller_ means the central, coordinating process which stores configuration, loads plugins, and renders the various user interfaces for Jenkins.
+ +
_Monthly Active User_ (or "MAU") is counted the first time in each calendar month that an End User’s device opens Customer’s or Customer’s Affiliates’ web and/or native application(s) in which the CloudBees Rollout SDK has been incorporated (“Customer Application”) is the Monthly Active User count of the applications using CloudBees Rollout. For example, if one End User is using Customer Application on four (4) separate devices, that constitutes four MAUs. _Monthly Active User_ (or "MAU") is counted the first time in each calendar month that an End User’s device opens Customer’s or Customer’s Affiliates’ web and/or native application(s) in which the CloudBees Rollout SDK has been incorporated (“Customer Application”) is the Monthly Active User count of the applications using CloudBees Rollout. For example, if one End User is using Customer Application on four (4) separate devices, that constitutes four MAUs.
+ +
_Node_ means a machine which is part of the Jenkins environment and capable of executing Pipelines or Projects. Both the Master and Agents are considered to be Nodes. _Node_ means a machine which is part of the Jenkins environment and capable of executing Pipelines or Projects. Both the Controllers and Agents are considered to be Nodes.
+ +
_Order Form_ means an order form that references this Agreement and has been executed by both parties. _Order Form_ means an order form that references this Agreement and has been executed by both parties.
+ +
......
...@@ -6,18 +6,18 @@ Must run behind CNAP or VPN (no internet facing). ...@@ -6,18 +6,18 @@ Must run behind CNAP or VPN (no internet facing).
CloudBees CI (formerly known as _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 controller
* `agent`: a Jenkins build agent * `agent`: a Jenkins build agent
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 CloudBees CI is given in the format `2.277.2.4-ra` A version of CloudBees CI is given in the format `2.277.4.4-ra`
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,
though a given master may be deliberately kept at a somewhat older release. though a given controller may be deliberately kept at a somewhat older release.
The `agent` image is preferably coversioned with the master. The `agent` image is preferably coversioned with the controller.
After creating images, create a values file that specifies locally uploaded images After creating images, create a values file that specifies locally uploaded images
plus whatever other customizations are desired: plus whatever other customizations are desired:
...@@ -25,13 +25,13 @@ plus whatever other customizations are desired: ...@@ -25,13 +25,13 @@ plus whatever other customizations are desired:
```yaml ```yaml
OperationsCenter: OperationsCenter:
Image: Image:
dockerImage: your-registry/core-oc:2.277.2.4-ra dockerImage: your-registry/core-oc:2.277.4.4-ra
Master: Master:
Image: Image:
dockerImage: your-registry/core-mm:2.277.2.4-ra dockerImage: your-registry/core-mm:2.277.4.4-ra
Agents: Agents:
Image: Image:
dockerImage: your-registry/agent:2.277.2.4-ra dockerImage: your-registry/agent:2.277.4.4-ra
``` ```
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:
......
apiVersion: v1 apiVersion: v1
name: "cloudbees/core/agent" name: "cloudbees/core/agent"
tags: tags:
- "2.277.2.4-ra" - "2.277.4.4-ra"
- latest - latest
labels: labels:
org.opencontainers.image.title: "agent" org.opencontainers.image.title: "agent"
...@@ -9,7 +9,7 @@ labels: ...@@ -9,7 +9,7 @@ labels:
org.opencontainers.image.licenses: proprietary org.opencontainers.image.licenses: proprietary
org.opencontainers.image.url: https://docs.cloudbees.com/docs/cloudbees-ci/ org.opencontainers.image.url: https://docs.cloudbees.com/docs/cloudbees-ci/
org.opencontainers.image.vendor: CloudBees org.opencontainers.image.vendor: CloudBees
org.opencontainers.image.version: "2.277.2.4-ra" org.opencontainers.image.version: "2.277.4.4-ra"
mil.dso.ironbank.image.keywords: cicd mil.dso.ironbank.image.keywords: cicd
mil.dso.ironbank.image.type: commercial mil.dso.ironbank.image.type: commercial
mil.dso.ironbank.product.name: CloudBees CI mil.dso.ironbank.product.name: CloudBees CI
...@@ -18,10 +18,10 @@ args: ...@@ -18,10 +18,10 @@ args:
BASE_TAG: "1.8.0" BASE_TAG: "1.8.0"
resources: resources:
- filename: files.tar - filename: files.tar
url: https://downloads.cloudbees.com/dsop-files/agent-files-90ae26796a628df8f4dbd365932b5ce78d89aebba6ed44a811289ec8b20d013b.tar url: https://downloads.cloudbees.com/dsop-files/agent-files-f6c7c30a5fbcdc25226b7ca5411379621a8c1a2c0a4a0c5b8749bcf5b91d9516.tar
validation: validation:
type: sha256 type: sha256
value: "90ae26796a628df8f4dbd365932b5ce78d89aebba6ed44a811289ec8b20d013b" value: "f6c7c30a5fbcdc25226b7ca5411379621a8c1a2c0a4a0c5b8749bcf5b91d9516"
maintainers: maintainers:
- email: productivity-team@cloudbees.com - email: productivity-team@cloudbees.com
name: CloudBees name: CloudBees
......
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