Update README and fix pipeline template destination

README.md

@@ -115,13 +115,15 @@ contra-env-setup/playbooks/group_vars/all/global.yml
  1. Install on a local server as user cloud-user.
  2. Setup pre-reqs (kvm driver and nested virtualization)
  3. Setup a minishift cluster
- 4. Setup OpenShift s2i templates from the project_repo=https://github.com/arilivigni/ci-pipeline
-    1. Override the project_repo with another one then the default in global.yml 
+ 4. Setup OpenShift s2i templates from the -e project_repo=https://github.com/arilivigni/ci-pipeline
+    1. Override the project_repo with another one then the default in global.yml
+    2. OpenShift project -e openshift_project=ari-ci-pipeline  
  5. Modify my container tags with the default tag. tag=stable
 
 ```
     ansible-playbook -vv -i "localhost," contra-env-setup/playbooks/setup.yml \
-    -e remote_user=cloud-user -e project_repo=https://github.com/arilivigni/ci-pipeline -K -k
+    -e remote_user=cloud-user -e project_repo=https://github.com/arilivigni/ci-pipeline 
+    -e openshift_project=ari-ci-pipeline -K -k
 
 ```
 _Note: The -K is used to prompt you for your password for sudo (if you require one) <br>
@@ -133,15 +135,16 @@ _Note: The -K is used to prompt you for your password for sudo (if you require o
  1. Install on a local server as user cloud-user.
  2. Setup pre-reqs (kvm driver and nested virtualization)
  3. Setup a minishift cluster
-  4. Setup OpenShift s2i templates from the project_repo=https://github.com/arilivigni/ci-pipeline
-     1. Override the project_repo with another one then the default in global.yml 
+ 4. Setup OpenShift s2i templates from the -e project_repo=https://github.com/arilivigni/ci-pipeline
+    1. Override the project_repo with another one then the default in global.yml
+    2. OpenShift project -e openshift_project=ari-ci-pipeline  
  5. Modify my container tags with the default tag. tag=stable
  6. Setup Jenkins 2.0 pipelines from the project_repo=https://github.com/arilivigni/ci-pipeline
 
 ```
     ansible-playbook -vv -i "localhost," contra-env-setup/playbooks/setup.yml \
     -e remote_user=cloud-user -e project_repo=https://github.com/arilivigni/ci-pipeline \
-    -e setup_pipelines=true -K -k
+    -e openshift_project=ari-ci-pipeline -e setup_pipelines=true -K -k
 
 ```
 _Note: The -K is used to prompt you for your password for sudo (if you require one) <br>
@@ -153,8 +156,9 @@ _Note: The -K is used to prompt you for your password for sudo (if you require o
  1. Install on a local server as user cloud-user.
  2. Setup pre-reqs (kvm driver and nested virtualization)
  3. Setup a minishift cluster
- 4. Setup OpenShift s2i templates from the project_repo=https://github.com/arilivigni/ci-pipeline
-    1. Override the project_repo with another one then the default in global.yml 
+ 4. Setup OpenShift s2i templates from the -e project_repo=https://github.com/arilivigni/ci-pipeline
+    1. Override the project_repo with another one then the default in global.yml
+    2. OpenShift project -e openshift_project=ari-ci-pipeline 
  5. Modify my container tags with the tag=develop
  6. Setup Jenkins 2.0 pipelines from the project_repo=https://github.com/arilivigni/ci-pipeline
  7. Setup sample project templates and pipelines 
@@ -164,7 +168,8 @@ _Note: The -K is used to prompt you for your password for sudo (if you require o
 ```
     ansible-playbook -vv -i "localhost," contra-env-setup/playbooks/setup.yml \
     -e remote_user=cloud-user -e project_repo=https://github.com/arilivigni/ci-pipeline \
-    -e tag=develop -e setup_pipelines=true -e setup_sample_project -K -k
+    -e openshift_project=ari-ci-pipeline -e tag=develop -e setup_pipelines=true \
+    -e setup_sample_project -K -k
 
 ```
 _Note: The -K is used to prompt you for your password for sudo (if you require one) <br>

playbooks/group_vars/all/global.yml

@@ -83,7 +83,6 @@ os_template_dir: "config/s2i"
 
 # Jenkins pipelines directory
 pipeline_dir: "config/pipelines"
-pipeline_dir_orig: "{{ pipeline_dir }}"
 
 # These are parameters that are passed to setup the containers from the project_repo
 PARAMS:
@@ -117,12 +116,11 @@ sample_project_refspec: '+refs/pull/*:refs/heads/*'
 sample_project_branch: 'master'
 
 # Sample project directory
-sample_project_dir: "{{ contra_env_setup_dir }}/{{ sample_project_repo.split('/')[-1] | replace('.git', '')}}"
+sample_project_dir: "{{ contra_env_setup_dir }}/{{ sample_project_repo.split('/')[-1] | replace('.git', '') }}"
 
 # Sample OpenSift template directory
 sample_os_template_dir: "config/s2i"
 
 # Sample Jenkins pipelines directory
 sample_pipeline_dir: "config/pipelines"
-sample_pipeline_dir_orig: "{{ sample_pipeline_dir }}"
 

playbooks/roles/create/tasks/main.yml

@@ -10,24 +10,6 @@
     - "{{ minishift_dest_dir }}"
     - "{{ loaded_pipelines_dir }}"
 
-- name: "Update os_template_dir based on repo"
-  set_fact:
-     os_template_dir: "{{ project_dir }}/{{ os_template_dir }}"
-
-- name: "Update pipeline_dir based on repo"
-  set_fact:
-     pipeline_dir: "{{ project_dir }}/{{ pipeline_dir }}"
-
-- name: "Update sample_os_template_dir based on repo"
-  set_fact:
-     sample_os_template_dir: "{{ sample_project_dir }}/{{ sample_os_template_dir }}"
-  when: (project_repo != sample_project_repo and setup_sample_project|bool == true)
-
-- name: "Update sample_pipeline_dir based on repo"
-  set_fact:
-     sample_pipeline_dir: "{{ sample_project_dir }}/{{ sample_pipeline_dir }}"
-  when: (project_repo != sample_project_repo and setup_sample_project|bool == true)
-
 # Clone the project_repo and sample_project_repo
 - name: "Clone the project repo {{ project_repo }}"
   import_tasks: clone_repos.yml

playbooks/roles/os_temps/tasks/setup_containers.yml

@@ -8,14 +8,14 @@
 # Use the repo's OpenShift s2i templates as the list to process
 - name: "Get OpenShift s2i template names from {{ os_template_dir }}"
   find:
-    paths: "{{ os_template_dir }}"
+    paths: "{{ project_dir }}/{{ os_template_dir }}"
     patterns: '*.yml,*.yaml'
     recurse: yes
   register: os_templates
 
 - name: "Get sample OpenShift s2i template names from {{ sample_os_template_dir }}/samples"
   find:
-    paths: "{{ sample_os_template_dir }}/samples"
+    paths: "{{ sample_project_dir }}/{{ sample_os_template_dir }}/samples"
     patterns: '*.yml,*.yaml'
     recurse: yes
   register: sample_os_templates
@@ -29,7 +29,7 @@
 
 - name: "Get sample jenkins OpenShift s2i template names from {{ sample_os_template_dir }}/jenkins"
   find:
-    paths: "{{ sample_os_template_dir }}/jenkins"
+    paths: "{{ sample_project_dir }}/{{ sample_os_template_dir }}/jenkins"
     patterns: '*.yml,*.yaml'
     recurse: yes
   register: sample_jenkins_os_templates

playbooks/roles/pipeline/tasks/setup_pipelines.yml

@@ -34,15 +34,15 @@
 - name: "Generate Jenkins XML config for pipeline jobs from the templates"
   template:
     src: "{{ playbook_dir }}/roles/pipeline/templates/jenkins-pipeline-setup.xml.j2"
-    dest: "{{ pipeline_dir_orig }}/{{ item.path.split('/')[-2] }}/config.xml"
+    dest: "{{ loaded_pipelines_dir }}/{{ item.path.split('/')[-2] }}/config.xml"
     force: yes
     mode: 0755
   with_items: "{{ pipelines.files }}"
 
 - name: "Generate Jenkins XML config for sample pipeline jobs from the templates"
   template:
     src: "{{ playbook_dir }}/roles/pipeline/templates/contra-sample-pipeline-setup.xml.j2"
-    dest: "{{ sample_pipeline_dir_orig }}/{{ item.path.split('/')[-2] }}/config.xml"
+    dest: "{{ loaded_pipelines_dir }}/{{ item.path.split('/')[-2] }}/config.xml"
     force: yes
     mode: 0755
   with_items: "{{ sample_pipelines.files }}"

playbooks/roles/pipeline/templates/contra-sample-pipeline-setup.xml.j2

@@ -50,7 +50,7 @@
       <submoduleCfg class="list"/>
       <extensions/>
     </scm>
-    <scriptPath>{{ sample_pipeline_dir_orig }}/{{ item.path.split('/')[-2] }}/{{ item.path.split('/')[-1] }}</scriptPath>
+    <scriptPath>{{ sample_project_repo.split('/')[-1] | replace('.git', '') }}/{{ sample_pipeline_dir }}/{{ item.path.split('/')[-1] }}</scriptPath>
     <lightweight>true</lightweight>
   </definition>
   <triggers/>

playbooks/roles/pipeline/templates/jenkins-pipeline-setup.xml.j2

@@ -50,7 +50,7 @@
       <submoduleCfg class="list"/>
       <extensions/>
     </scm>
-    <scriptPath>{{ pipeline_dir_orig }}/{{ item.path.split('/')[-2] }}/{{ item.path.split('/')[-1] }}</scriptPath>
+    <scriptPath>{{ project_repo.split('/')[-1] | replace('.git', '') }}/{{ pipeline_dir }}/{{ item.path.split('/')[-1] }}</scriptPath>
     <lightweight>true</lightweight>
   </definition>
   <triggers/>