Page MenuHomeDevCentral
Files F3748858

D1760.diff
No OneTemporary
Actions

D1760.diff
View Options

diff --git a/PORTS b/PORTS
--- a/PORTS
+++ b/PORTS
@@ -7,4 +7,5 @@
34080 Etherpad
38080 Jenkins HTTP - CD
39080 Cachet HTTP
+ 42080 Jenkins HTTP - CI
50000 Jenkins master's port for JNLP-based Jenkins agents - CD
diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
--- a/pillar/paas/docker.sls
+++ b/pillar/paas/docker.sls
@@ -50,6 +50,8 @@
equatower:
cd:
subnet: 172.18.1.0/24
+ ci:
+ subnet: 172.18.2.0/24
# -------------------------------------------------------------
# Docker engine configuration
@@ -125,6 +127,12 @@
host: cd.nasqueron.org
app_port: 38080
jnlp_port: 50000
+ jenkins_ci:
+ realm: ci
+ host: ci.nasqueron.org
+ app_port: 42080
+ jnlp_port: 55000
+
jenkins_slave:
# Slaves for CD
@@ -138,6 +146,12 @@
image: rust
realm: cd
+ zateki: &php_for_ci
+ image: php
+ realm: ci
+
+ zenerre: *php_for_ci
+
# Infrastructure and development services
phabricator:
diff --git a/pillar/saas/jenkins.sls b/pillar/saas/jenkins.sls
--- a/pillar/saas/jenkins.sls
+++ b/pillar/saas/jenkins.sls
@@ -14,6 +14,9 @@
cd:
ssh_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICiWLxPzS8X6NraVwsK95gFGe1pIuz+K0n7aw81nabcf jenkins-master-equatower-cd
network: cd
+ ci:
+ ssh_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhhBMTjGguFBy2aOczmZ7NS14b57uoKnzepMtFHh7cpsmbp1Jvf7LOH0niyFOAMlVMqObXJ+8zsd+x9XqMlWUfVOF07D1/GUq09YA7DQsjMc6CdcW68VtcKcUdAnB3yUVX0fZ6bGwnTAnZvAq1oAxuLXE42eBQUti142ic0OF5y5ePs9gu9rOmUzLuydv2+iB34RuopF6VlzROlatyITvr4KPnAhEAuRiVBqWIIWvsT4EMYRlddXC21sPEqUHr3T7FgS2Kmp/1Iw4Hk98srC59lSYOmMLPlTSfuYIoRorGIv3UHeW5DHHeEN+wEnvTPAaO/fiWJfOQBHshWJFN4mOj jenkins@ci.nasqueron.org
+ network: ci
# -------------------------------------------------------------
# Jenkins images
diff --git a/roles/paas-docker/containers/jenkins.sls b/roles/paas-docker/containers/jenkins.sls
--- a/roles/paas-docker/containers/jenkins.sls
+++ b/roles/paas-docker/containers/jenkins.sls
@@ -25,12 +25,12 @@
- makedirs: True
{% if has_selinux %}
-selinux_context_jenkins_home:
+selinux_context_jenkins_home_{{ instance }}:
selinux.fcontext_policy_present:
- name: {{ home }}
- sel_type: container_file_t
-selinux_context_jenkins_home_applied:
+selinux_context_jenkins_home_applied_{{ instance }}:
selinux.fcontext_policy_applied:
- name: {{ home }}
{% endif %}

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 11:04 (19 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2249253
Default Alt Text
D1760.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator