UNCLASSIFIED

Commit e8d4815b authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master'

Development

See merge request !32
parents 8d28cb8d 2431f88b
Pipeline #156168 failed with stages
in 1 minute and 46 seconds
...@@ -21,7 +21,6 @@ RUN dnf update -y --nodocs && \ ...@@ -21,7 +21,6 @@ RUN dnf update -y --nodocs && \
nss_wrapper \ nss_wrapper \
git `# commonly used outside a container step (see JENKINS-30600), and traditionally part of openjdk:8-jdk` && \ git `# commonly used outside a container step (see JENKINS-30600), and traditionally part of openjdk:8-jdk` && \
dnf -y clean all dnf -y clean all
# TODO https://github.com/git-lfs/git-lfs/wiki/Installation#rhelcentos → ius.io / https://packagecloud.io/github/git-lfs/install#bash-rpm
WORKDIR /home/${user} WORKDIR /home/${user}
...@@ -35,8 +34,9 @@ RUN cd / && \ ...@@ -35,8 +34,9 @@ RUN cd / && \
tar xvf /tmp/files.tar && \ tar xvf /tmp/files.tar && \
rm /tmp/files.tar rm /tmp/files.tar
COPY scripts/ / COPY scripts/ /
RUN rpm -i /rpms/*.rpm && \
RUN chmod 755 /usr/share/jenkins && \ rm -rf /rpms && \
chmod 755 /usr/share/jenkins && \
chmod 644 /usr/share/jenkins/agent.jar && \ chmod 644 /usr/share/jenkins/agent.jar && \
chmod a+x /usr/local/bin/* && \ chmod a+x /usr/local/bin/* && \
chmod ug-s /usr/libexec/openssh/ssh-keysign && \ chmod ug-s /usr/libexec/openssh/ssh-keysign && \
......
@Library('DCCSCR@master') _ @Library('DCCSCR@master') _
dccscrPipeline(version: '2.235.5.1') dccscrPipeline(version: '2.249.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.249.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.249.2.3
Master: Master:
Image: Image:
dockerImage: your-registry/core-mm:2.235.5.1 dockerImage: your-registry/core-mm:2.249.2.3
Agents: Agents:
Image: Image:
dockerImage: your-registry/agent:2.235.5.1 dockerImage: your-registry/agent:2.249.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/agent-files-772c2ae9613e822d081fe6158bf84ab423367c46f8c3ac3fb23596ee229f415a.tar", "url": "https://downloads.cloudbees.com/dsop-files/agent-files-805e797f027018844fd4b59eef722fabd7d4b015d2ff4ebd652d1146e00b94cb.tar",
"filename": "files.tar", "filename": "files.tar",
"validation": { "validation": {
"type": "sha256", "type": "sha256",
"value": "772c2ae9613e822d081fe6158bf84ab423367c46f8c3ac3fb23596ee229f415a" "value": "805e797f027018844fd4b59eef722fabd7d4b015d2ff4ebd652d1146e00b94cb"
} }
} }
] ]
......
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