From aa81bcdd6ee464436c0eef8672ee0652c4f47235 Mon Sep 17 00:00:00 2001 From: Ubbo Veentjer Date: Tue, 8 Mar 2022 09:04:36 +0100 Subject: [PATCH 1/3] feat(ci-cd.md): recommend gitlab-ci --- chapters/ci-cd.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chapters/ci-cd.md b/chapters/ci-cd.md index bcbae47..f54496a 100644 --- a/chapters/ci-cd.md +++ b/chapters/ci-cd.md @@ -36,6 +36,10 @@ The workflows we are currently using in Jenkins and the GitLab Runner are: - Distribution (Nexus, APTLY repo, eXist repo) - Release Management (via GitLab Environments and gitflow) +### GitLab CI + +We RECOMMEND to [use GitLab for CI/CD](https://docs.gitlab.com/ee/ci/quick_start/). + ### Sample Configuration of the GitLab Runner There is a [full and documented example](https://gitlab.gwdg.de/SADE/SADE/blob/develop/.gitlab-ci.yml) of how the -- GitLab From aa91192131dced73cf18b7bde45c07cd9af7bdd5 Mon Sep 17 00:00:00 2001 From: Ubbo Veentjer Date: Thu, 10 Mar 2022 09:53:41 +0100 Subject: [PATCH 2/3] fix: remove deprecated references to Jenkins --- chapters/ci-cd.md | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/chapters/ci-cd.md b/chapters/ci-cd.md index f54496a..d00b8f9 100644 --- a/chapters/ci-cd.md +++ b/chapters/ci-cd.md @@ -27,12 +27,12 @@ The generic links for all projects are: - Link: `https://gitlab.gwdg.de/%{project_path}/commits/%{default_branch}` - Badge image URL: `https://gitlab.gwdg.de/%{project_path}/badges/%{default_branch}/coverage.svg?style=flat-square` -The workflows we are currently using in Jenkins and the GitLab Runner are: +The workflows we are currently using in the GitLab Runner are: - Code building - Testing -- Code analyzer (Sonar) -- Packaging (JAR, WAR, DEB, XAR) +- Code analyzer +- Packaging (JAR, WAR, DEB, XAR, Docker Image) - Distribution (Nexus, APTLY repo, eXist repo) - Release Management (via GitLab Environments and gitflow) @@ -45,26 +45,6 @@ We RECOMMEND to [use GitLab for CI/CD](https://docs.gitlab.com/ee/ci/quick_start There is a [full and documented example](https://gitlab.gwdg.de/SADE/SADE/blob/develop/.gitlab-ci.yml) of how the GitLab Runner is used in SADE. -### Sample Configuration of the Jenkins CI (Multibranch Pipelines) - -- On commit and push to a gitolite repo (such as -), Jenkins on [ci.de.dariah.eu](https://ci.de.dariah.eu/jenkins) -is notified (see projects' gitolite configuration) - -- Jenkins then checks out and builds the configured branches (see projects' Jenkins multibranch pipeline -configuration such as . - -- Stage *Preparation*: Prepare things - -- Stage *Build*: Build, JAR, WAR, and DEB packages from source code, deploy JAR and WAR packages to the [Nexus -repo](https://nexus.gwdg.de). For further information on Nexus cf. the [CI server -documentation](https://wiki.de.dariah.eu/display/FEAD/ci.de.dariah.eu). Jenkins is configured to deploy JARs and WARs -via Maven and a Nexus deploy-account. - -- Stage *Publish*: Publish DEB packages to the [DARIAH-DE Aptly Repo](https://ci.de.dariah.eu/aptly). Jenkins uses -a shared library of scripts and publishing is divided into four conditionals: TG version, DH version, SNAPSHOT version, -or RELEASE version due to given version suffixes! - ## Continuous Delivery and Continuous Deployment Continuous Delivery aims at minimizing the [gap between development and production](https://12factor.net/dev-prod-parity) -- GitLab From 569291c7b5d75a2362a6f6f058977d4e6b905a36 Mon Sep 17 00:00:00 2001 From: Ubbo Veentjer Date: Thu, 10 Mar 2022 09:55:31 +0100 Subject: [PATCH 3/3] style: better wording --- chapters/ci-cd.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapters/ci-cd.md b/chapters/ci-cd.md index d00b8f9..ffcef86 100644 --- a/chapters/ci-cd.md +++ b/chapters/ci-cd.md @@ -38,7 +38,7 @@ The workflows we are currently using in the GitLab Runner are: ### GitLab CI -We RECOMMEND to [use GitLab for CI/CD](https://docs.gitlab.com/ee/ci/quick_start/). +Using [GitLab for CI/CD](https://docs.gitlab.com/ee/ci/quick_start/) is `RECOMMENDED`. ### Sample Configuration of the GitLab Runner -- GitLab