From 5c679ecb01cf0af6ab3afeffbd2e21246f24649d Mon Sep 17 00:00:00 2001 From: Michal Kovarik Date: Mar 13 2020 11:03:35 +0000 Subject: Merge #48 `Add jenkins install/delete to Makefile` --- diff --git a/c3iaas/Makefile b/c3iaas/Makefile index cf10dd9..7d0cbfc 100644 --- a/c3iaas/Makefile +++ b/c3iaas/Makefile @@ -24,6 +24,25 @@ install: --param-file ./$(JOBS_DIR)/$${job}.env | $(OC_CMD) apply -f -; \ echo "[PIPELINE] Pipeline job \"$${job}\" updated" ; \ done + +create-jenkins-is: + $(OC_CMD) import-image jenkins:2 --confirm --scheduled=true \ + --from=registry.access.redhat.com/openshift3/jenkins-2-rhel7:v3.11 + +get-jenkins-plugins: + $(shell ./get-all-jenkins-plugins.sh) + +install-jenkins: create-jenkins-is get-jenkins-plugins + $(OC_CMD) new-app --template=jenkins-persistent \ + -p MEMORY_LIMIT=2Gi \ + -p VOLUME_CAPACITY=2Gi \ + -p NAMESPACE=$(shell $(OC_CMD) project -q) \ + -e INSTALL_PLUGINS=$(shell cat default-jenkins-plugins.txt) \ + -e JENKINS_JAVA_OVERRIDES="-Dpermissive-script-security.enabled=no_security" + +remove-jenkins: + $(OC_CMD) delete -l app=jenkins-persistent all,sa,rolebindings,pvc + uninstall: @for job in $(JOBS); do \ echo "[PIPELINE] Deleting pipeline job \"$${job}\"..." ; \ @@ -32,4 +51,4 @@ uninstall: --param-file ./$(JOBS_DIR)/$${job}.env | $(OC_CMD) delete -f -; \ echo "[PIPELINE] Pipeline job \"$${job}\" deleted" ; \ done -.PHONY: help install uninstall +.PHONY: help install install-jenkins remove-jenkins uninstall diff --git a/c3iaas/get-all-jenkins-plugins.sh b/c3iaas/get-all-jenkins-plugins.sh new file mode 100755 index 0000000..f87a29f --- /dev/null +++ b/c3iaas/get-all-jenkins-plugins.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +curl https://raw.githubusercontent.com/openshift/jenkins/master/2/contrib/openshift/base-plugins.txt | grep -v "#" |grep -v '^$' | sed 's/:.*/:latest/'| tr '\n' ',' > default-jenkins-plugins.txt + +cat jenkins-plugins.txt | tr '\n' ',' >> default-jenkins-plugins.txt diff --git a/c3iaas/jenkins-plugins.txt b/c3iaas/jenkins-plugins.txt new file mode 100644 index 0000000..0414409 --- /dev/null +++ b/c3iaas/jenkins-plugins.txt @@ -0,0 +1,6 @@ +script-security:latest +permissive-script-security:latest +timestamper:latest +http_request:latest +antisamy-markup-formatter:latest +update-sites-manager:latest