Replace incorrect hardcoded values, update jenkins version (#2505)

redhat-cop · Sep 15, 2020 · d135afc · d135afc
1 parent 1f96dd9
commit d135afc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ansible/roles_ocp_workloads/ocp4_workload_dso/defaults/main.yml b/ansible/roles_ocp_workloads/ocp4_workload_dso/defaults/main.yml
@@ -6,10 +6,10 @@ silent: False
 ###### OpenShift defaults
 
 # Used for jenkins pipelining, temporary directory, and bastion hostname
-ocp4_dso_guid: raleigh-fb78
+ocp4_dso_guid: "{{ guid }}"
 
 # Needed for jenkins pipelining for oscap-docker
-ocp4_dso_domain: "{{ ocp4_dso_guid }}.openshiftworkshop.com"
+ocp4_dso_domain: "{{ ocp4_dso_guid }}{{ subdomain_base_suffix }}"
 
 # Needed for jenkins pipelining for oscap-docker
 ocp4_dso_bastion: "bastion.{{ ocp4_dso_domain }}"

diff --git a/ansible/roles_ocp_workloads/ocp4_workload_dso/tasks/infrastructure.yml b/ansible/roles_ocp_workloads/ocp4_workload_dso/tasks/infrastructure.yml
@@ -69,7 +69,7 @@
 
 - name: create custom jenkins image
   shell: |
-    {{ ocp4_dso_openshift_cli }} new-build -D $'FROM jenkins:latest\nUSER 0\nRUN curl -kL https://updates.jenkins-ci.org/download/plugins/ssh-steps/1.2.1/ssh-steps.hpi -o /usr/lib/jenkins/ssh-steps.hpi && chmod 665 /usr/lib/jenkins/ssh-steps.hpi && sed -i '\''s/{ print $1; }/ {a=$1} END{print a}/'\'' /usr/libexec/s2i/run' --to=custom-jenkins -n openshift
+    {{ ocp4_dso_openshift_cli }} new-build -D $'FROM jenkins:2\nUSER 0\nRUN curl -kL https://updates.jenkins-ci.org/download/plugins/ssh-steps/1.2.1/ssh-steps.hpi -o /usr/lib/jenkins/ssh-steps.hpi && chmod 665 /usr/lib/jenkins/ssh-steps.hpi && sed -i '\''s/{ print $1; }/ {a=$1} END{print a}/'\'' /usr/libexec/s2i/run' --to=custom-jenkins -n openshift
   ignore_errors: true
 
 - name: wait for custom jenkins build to finish