Merge pull request #154 from dirgim/always-check-latest-build

When checking the status of container builds always check the latest one
CentOS-PaaS-SIG · Mar 22, 2019 · 1c7dac4 · 1c7dac4
2 parents 50e1f75 + 88b96a7
commit 1c7dac4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/playbooks/roles/os_temps/tasks/build_new_app.yml b/playbooks/roles/os_temps/tasks/build_new_app.yml
@@ -28,7 +28,7 @@
 
 # Wait container in the pipeline to start building
 - name: "{{ container_config_name }} :: Wait for {{  build_config_name_files[template_name] }} to be queued"
-  shell: "{{ oc_bin }} get builds | grep '{{  build_config_name_files[template_name] }}'"
+  shell: "{{ oc_bin }} get builds | egrep \"{{ build_config_name_files[template_name] }}-[0-9]*\\s\" | sort -V | tail -n 1"
   register: oc_build_result
   until: oc_build_result.stdout.find(" Running ") != -1 or oc_build_result.stdout.find(" Failed ") != -1
   retries: 6

diff --git a/playbooks/roles/os_temps/tasks/check_new_app.yml b/playbooks/roles/os_temps/tasks/check_new_app.yml
@@ -6,7 +6,7 @@
 
 # Wait container in the pipeline to be finished building
 - name: "{{ container_config_name }} :: Wait for {{  build_config_name_files[template_name] }} to be built and marked with latest tag"
-  shell: "{{ oc_bin }} get builds | grep '{{ build_config_name_files[template_name] }}'"
+  shell: "{{ oc_bin }} get builds | egrep \"{{ build_config_name_files[template_name] }}-[0-9]*\\s\" | sort -V | tail -n 1"
   register: oc_build_result
   until: (oc_build_result.stdout.find(" Running ") == -1 or oc_build_result.stdout.find(" Failed ") != -1)
   retries: 300