D2681.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2681.diff
View Options

	diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
	--- a/pillar/paas/docker.sls
	+++ b/pillar/paas/docker.sls
	@@ -57,6 +57,7 @@
	- jenkins/jenkins
	- nasqueron/jenkins-agent-node
	- nasqueron/jenkins-agent-php
	+ - nasqueron/jenkins-agent-php:7.4.23
	- nasqueron/jenkins-agent-rust
	- nasqueron/tommy

	@@ -249,26 +250,28 @@
	# Agents for CD

	apsile: &php_for_cd
	- image: php
	+ image_flavour: php
	realm: cd

	elapsi: *php_for_cd

	rust_brown:
	- image: rust
	+ image_flavour: rust
	realm: cd

	yarabokin:
	- image: node
	+ image_flavour: node
	realm: cd

	# Agents for CI

	zateki: &php_for_ci
	- image: php
	+ image_flavour: php
	realm: ci

	- zenerre: *php_for_ci
	+ zenerre:
	+ <<: *php_for_ci
	+ version: 7.4.23

	tommy:
	tommy_ci:
	diff --git a/roles/paas-docker/containers/jenkins_agent.sls b/roles/paas-docker/containers/jenkins_agent.sls
	--- a/roles/paas-docker/containers/jenkins_agent.sls
	+++ b/roles/paas-docker/containers/jenkins_agent.sls
	@@ -13,7 +13,8 @@

	{% set realm = pillar['jenkins_realms'][container['realm']] %}
	{% set home = "/srv/jenkins/" + container['realm'] + "/agents_homes/" + instance %}
	-{% set image = pillar['jenkins_images'][container['image']] %}
	+{% set image = pillar['jenkins_images'][container['image_flavour']] %}
	+{% set image = salt['paas_docker.get_image'](image, container) %}

	# -------------------------------------------------------------
	# Home directory