diff --git a/ansible/roles_ocp_workloads/ocp4_workload_tl500/tasks/workload.yml b/ansible/roles_ocp_workloads/ocp4_workload_tl500/tasks/workload.yml index 508557b84cd..bb67313c328 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_tl500/tasks/workload.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_tl500/tasks/workload.yml @@ -152,6 +152,12 @@ retries: 3 delay: 10 +- name: Determine the installed Gitlab operator version + ansible.builtin.command: >- + oc get subscription -n gitlab-system gitlab-operator-kubernetes \ + -o jsonpath={.status.currentCSV} + register: gitlab_operator_version_cmd + - name: Install tl500-course-content chart command: "{{ item }}" args: @@ -160,8 +166,13 @@ - "helm dep up" - "helm upgrade --install tl500-course-content . \ --set app_domain={{ ocp4_workload_tl500_apps_domain }} \ + --set gitlab.chart_version={{ gitlab_chart_version }} \ --namespace tl500 --create-namespace --timeout=20m" register: tl500_course_content + vars: + gitlab_chart_version: "{{ lookup('ansible.builtin.url', gitlab_url, wantlist=true) | first }}" + gitlab_url: "https://gitlab.com/gitlab-org/cloud-native/gitlab-operator/-/raw/{{ gitlab_op_ver }}/CHART_VERSIONS" + gitlab_op_ver: "{{ gitlab_operator_version_cmd.stdout | split('.v') | last }}" until: tl500_course_content.rc == 0 ignore_errors: true retries: 3