UNCLASSIFIED

Commit 2e46e043 authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master'

Development

See merge request !43
parents e8d4815b 154f9ca1
Pipeline #193100 failed with stages
in 1 minute and 6 seconds
...@@ -26,13 +26,8 @@ WORKDIR /home/${user} ...@@ -26,13 +26,8 @@ WORKDIR /home/${user}
ENTRYPOINT ["entrypoint", "jenkins-agent"] ENTRYPOINT ["entrypoint", "jenkins-agent"]
# TODO LABELS COPY files.tar /tmp
RUN cd / && tar xvf /tmp/files.tar && rm /tmp/files.tar
ARG TARBALL=files.tar
COPY ${TARBALL} /tmp
RUN cd / && \
tar xvf /tmp/files.tar && \
rm /tmp/files.tar
COPY scripts/ / COPY scripts/ /
RUN rpm -i /rpms/*.rpm && \ RUN rpm -i /rpms/*.rpm && \
rm -rf /rpms && \ rm -rf /rpms && \
......
@Library('DCCSCR@master') _
dccscrPipeline(version: '2.249.2.3')
...@@ -9,7 +9,7 @@ CloudBees CI (formerly known as _CloudBees Core_) consists of three Docker image ...@@ -9,7 +9,7 @@ CloudBees CI (formerly known as _CloudBees Core_) consists of three Docker image
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.249.2.3` A version of CloudBees CI is given in the format `2.263.2.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,
...@@ -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.249.2.3 dockerImage: your-registry/core-oc:2.263.2.4-ra
Master: Master:
Image: Image:
dockerImage: your-registry/core-mm:2.249.2.3 dockerImage: your-registry/core-mm:2.263.2.4-ra
Agents: Agents:
Image: Image:
dockerImage: your-registry/agent:2.249.2.3 dockerImage: your-registry/agent:2.263.2.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:
......
{
"resources": [
{
"url": "https://downloads.cloudbees.com/dsop-files/agent-files-805e797f027018844fd4b59eef722fabd7d4b015d2ff4ebd652d1146e00b94cb.tar",
"filename": "files.tar",
"validation": {
"type": "sha256",
"value": "805e797f027018844fd4b59eef722fabd7d4b015d2ff4ebd652d1146e00b94cb"
}
}
]
}
apiVersion: v1
name: cloudbees/core/agent
tags:
- "2.263.2.4-ra"
- latest
labels:
org.opencontainers.image.title: "agent"
org.opencontainers.image.description: "CloudBees CI (agent subcomponent)"
org.opencontainers.image.licenses: proprietary
org.opencontainers.image.url: https://docs.cloudbees.com/docs/cloudbees-ci/
org.opencontainers.image.vendor: CloudBees
org.opencontainers.image.version: "2.263.2.4-ra"
mil.dso.ironbank.image.keywords: cicd
mil.dso.ironbank.image.type: commercial
mil.dso.ironbank.product.name: CloudBees CI
args:
BASE_IMAGE: "redhat/openjdk/openjdk8"
BASE_TAG: "1.8.0"
resources:
- filename: files.tar
url: https://downloads.cloudbees.com/dsop-files/agent-files-cc9d1052834f6b3cd943436374dd7081273d0f46e5ec8931974cb716fa004952.tar
validation:
type: sha256
value: "cc9d1052834f6b3cd943436374dd7081273d0f46e5ec8931974cb716fa004952"
maintainers:
- email: productivity-team@cloudbees.com
- email: andre.maksymowicz@centauricorp.com
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