Rework importing of os templates #49
Conversation
arilivigni
commented
Jun 5, 2018
arilivigni
commented
- Always load helper containers {linchpin,ansible}-executor
- project_repo != sample_project_repo
- Reworked to reduce code duplication
- project, helper, jenkins sample, samples if needed
* Always load helper containers {linchpin,ansible}-executor
* project_repo != sample_project_repo
* Always load helper containers {linchpin,ansible}-executor
* project_repo != sample_project_repo
* Reworked to reduce code duplication
* Always load helper containers {linchpin,ansible}-executor
* project_repo != sample_project_repo
* Reworked to reduce code duplication
|
@A890571 |
|
|
||
| # Check if Jenkins is running | ||
| - name: "Check to see if a Jenkins Master instance is running" | ||
| shell: "{{ oc_bin }} get pods | grep -i 'running' | grep -i 'jenkins' | tail -1 | awk '{print $1}'" |
There was a problem hiding this comment.
are we in the correct project here for the query?
There was a problem hiding this comment.
In my testing I was. Is there something I should do at the top like oc project {{ openshift_project }}
There was a problem hiding this comment.
I guess a shell task right before would be a safe bet.
There was a problem hiding this comment.
+1 - Sure I will ad that in the next change.
* Always load helper containers {linchpin,ansible}-executor
* project_repo != sample_project_repo
* Reworked to reduce code duplication
* Added switch to project shell command before making changes to the current project
| # Switch to right OpenShift project defined in {{ {{ openshift_project }}" }} | ||
| - name: "Switch to project {{ openshift_project }}" | ||
| shell: "{{ oc_bin }} project {{ openshift_project }}" | ||
| register: cluster_ip_register |
There was a problem hiding this comment.
not sure we need these 2 lines...
There was a problem hiding this comment.
I mean you can remove register and when
* Always load helper containers {linchpin,ansible}-executor
* project_repo != sample_project_repo
* Reworked to reduce code duplication
* Added switch to project shell command before making changes to the current project
* fixed issue - remvoed when and register
* Always load helper containers {linchpin,ansible}-executor
* project_repo != sample_project_repo
* Reworked to reduce code duplication
* Remove switch to project we already do that
|
@scoheb Can you review again after the last changes. I verified when deleting everything and running the setup CVP and Helper containers were added as expected |
| @@ -13,7 +13,7 @@ | |||
|
|
|||
| # Get ip of the cluster unless it was provided | |||
| - name: "Get the cluster Server URL for project {{ openshift_project }}" | |||
| shell: "{{ oc_bin }} status | egrep '{{ openshift_project }}.*server' | awk '{print $NF}'" | |||
| shell: "{{ oc_bin }} status | grep 'https' | awk '{print $NF}'" | |||
There was a problem hiding this comment.
probably should have a | head -1 after the awk
my output was:
shebert@localhost~/work/cvp/pipeline:fix-brew-nvr-scope$ oc status | grep https | awk '{print $NF}'
https://127.0.0.1:8443
(svc/jenkins)
docker.io/openshift/jenkins-2-centos7:v3.9
docker.io/openshift/jenkins-2-centos7:v3.9
https://gitlab.cee.redhat.com/Feuerkasten/xCI-systems.git#stage
* Always load helper containers {linchpin,ansible}-executor
* project_repo != sample_project_repo
* Reworked to reduce code duplication
* Remove switch to project we already do that
* Narrow match with head -1
