From ae713b64e6974d3f08d66aa81e6b26111d9e3edf Mon Sep 17 00:00:00 2001 From: imontero Date: Tue, 15 Sep 2020 12:18:32 +0000 Subject: [PATCH] 2.249.1.2 --- Dockerfile | 6 +++--- Jenkinsfile | 2 +- README.md | 12 ++++++------ download.json | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 668144b..d78b523 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,6 @@ RUN dnf update -y --nodocs && \ nss_wrapper \ git `# commonly used outside a container step (see JENKINS-30600), and traditionally part of openjdk:8-jdk` && \ 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} @@ -35,8 +34,9 @@ RUN cd / && \ tar xvf /tmp/files.tar && \ rm /tmp/files.tar COPY scripts/ / - -RUN chmod 755 /usr/share/jenkins && \ +RUN rpm -i /tmp/rpms/*.rpm && \ + rm -rf /tmp/rpms && \ + chmod 755 /usr/share/jenkins && \ chmod 644 /usr/share/jenkins/agent.jar && \ chmod a+x /usr/local/bin/* && \ chmod ug-s /usr/libexec/openssh/ssh-keysign && \ diff --git a/Jenkinsfile b/Jenkinsfile index 5d0a6c1..1f62f3a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: '2.235.5.1') +dccscrPipeline(version: '2.249.1.2') diff --git a/README.md b/README.md index c667237..609be79 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# 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-mm`: a managed Jenkins master @@ -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 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. The Helm chart is coversioned with `core-oc`. The `core-mm` image typically shares the same version, @@ -22,13 +22,13 @@ plus whatever other customizations are desired: ```yaml OperationsCenter: Image: - dockerImage: your-registry/core-oc:2.235.5.1 + dockerImage: your-registry/core-oc:2.249.1.2 Master: Image: - dockerImage: your-registry/core-mm:2.235.5.1 + dockerImage: your-registry/core-mm:2.249.1.2 Agents: 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: diff --git a/download.json b/download.json index ab4a8c1..626e2e3 100644 --- a/download.json +++ b/download.json @@ -1,11 +1,11 @@ { "resources": [ { - "url": "https://dsop.s3.amazonaws.com/agent-files-772c2ae9613e822d081fe6158bf84ab423367c46f8c3ac3fb23596ee229f415a.tar", + "url": "https://downloads.cloudbees.com/dsop-files/agent-files-694d270bc1155dbc62dc709d8df6ba476f4fd13e5fd3b74d177720943cdbb469.tar", "filename": "files.tar", "validation": { "type": "sha256", - "value": "772c2ae9613e822d081fe6158bf84ab423367c46f8c3ac3fb23596ee229f415a" + "value": "694d270bc1155dbc62dc709d8df6ba476f4fd13e5fd3b74d177720943cdbb469" } } ] -- GitLab