UNCLASSIFIED

Skip to content

GitLab

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

Merge branch '2.235.2.3' into 'development' 

2.235.2.3

See merge request !15
parents e209d252 45ab26c1
Pipeline #30258 passed with stage
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 12 deletions
Dockerfile
View file @ db181106
ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io
ARG BASE_IMAGE=redhat/openjdk/openjdk8 ARG BASE_IMAGE=redhat/openjdk/openjdk8
ARG BASE_TAG=latest ARG BASE_TAG=1.8.0
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
USER root
ARG user=jenkins ARG user=jenkins
ARG group=jenkins ARG group=jenkins
ARG uid=1000 ARG uid=1000
...@@ -21,8 +23,6 @@ RUN dnf update -y --nodocs && \ ...@@ -21,8 +23,6 @@ RUN dnf update -y --nodocs && \
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 # TODO https://github.com/git-lfs/git-lfs/wiki/Installation#rhelcentos → ius.io / https://packagecloud.io/github/git-lfs/install#bash-rpm
VOLUME /home/${user}/.jenkins
VOLUME ${AGENT_WORKDIR}
WORKDIR /home/${user} WORKDIR /home/${user}
ENTRYPOINT ["entrypoint", "jenkins-agent"] ENTRYPOINT ["entrypoint", "jenkins-agent"]
...@@ -40,7 +40,10 @@ RUN chmod 755 /usr/share/jenkins && \ ...@@ -40,7 +40,10 @@ RUN 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 && \
mkdir -p ${AGENT_WORKDIR} && \ mkdir -p ${AGENT_WORKDIR} .jenkins && \
chown -R ${user}:0 /home/${user} && \ chown -R ${user}:0 /home/${user} && \
chmod g+rwx /home/${user} chmod g+rwx . ${AGENT_WORKDIR} .jenkins
USER ${uid} USER ${uid}
VOLUME /home/${user}/.jenkins
VOLUME ${AGENT_WORKDIR}
Jenkinsfile
View file @ db181106
@Library('DCCSCR@master') _ @Library('DCCSCR@master') _
dccscrPipeline(version: '2.222.4.3') dccscrPipeline(version: '2.235.2.3')
README.md
View file @ db181106
...@@ -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.222.4.3` A version of Core is given in the format `2.235.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.222.4.3 dockerImage: your-registry/core-oc:2.235.2.3
Master: Master:
Image: Image:
dockerImage: your-registry/core-mm:2.222.4.3 dockerImage: your-registry/core-mm:2.235.2.3
Agents: Agents:
Image: Image:
dockerImage: your-registry/agent:2.222.4.3 dockerImage: your-registry/agent:2.235.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:
......
download.json
View file @ db181106
{ {
"resources": [ "resources": [
{ {
"url": "https://dsop.s3.amazonaws.com/agent-files-254ca1800193cd3e909f60400a0a5cfdd36890b5d70f7df0b8e261e9e8138bbb.tar", "url": "https://dsop.s3.amazonaws.com/agent-files-1f33d6d660d81ff4d28c0d9e9e77020e18b07b770f34ee26ff95c5b82b03efd4.tar",
"filename": "files.tar", "filename": "files.tar",
"validation": { "validation": {
"type": "sha256", "type": "sha256",
"value": "254ca1800193cd3e909f60400a0a5cfdd36890b5d70f7df0b8e261e9e8138bbb" "value": "1f33d6d660d81ff4d28c0d9e9e77020e18b07b770f34ee26ff95c5b82b03efd4"
} }
} }
] ]
......
  • jenkins-gitlab @jenkins-gitlab ·

    Pipeline Status: SUCCESS
    Branch: development

    graph LR
  0([setup]):::INTERNAL_SUCCESS --> 1([Import Artifacts]):::SUCCESS --> 2((/)):::INTERNAL_SUCCESS --> 3([Stage Artifacts]):::SUCCESS --> 4((/)):::INTERNAL_SUCCESS --> 5([Build]):::SUCCESS --> 6([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
  • jenkins-gitlab @jenkins-gitlab ·

    Pipeline Status: SUCCESS
    Branch: development

    graph LR
  0([setup]):::INTERNAL_SUCCESS --> 1([Import Artifacts]):::SUCCESS --> 2((/)):::INTERNAL_SUCCESS --> 3([Stage Artifacts]):::SUCCESS --> 4((/)):::INTERNAL_SUCCESS --> 5([Build]):::SUCCESS --> 6([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
  • jenkins-gitlab @jenkins-gitlab ·

    Pipeline Status: SUCCESS
    Branch: development

    graph LR
  0([setup]):::INTERNAL_SUCCESS --> 1([Import Artifacts]):::SUCCESS --> 2((/)):::INTERNAL_SUCCESS --> 3([Stage Artifacts]):::SUCCESS --> 4((/)):::INTERNAL_SUCCESS --> 5([Build]):::SUCCESS --> 6([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