diff --git a/playbooks/manual/mirrormanager/emergency-expire-repo.yml b/playbooks/manual/mirrormanager/emergency-expire-repo.yml index 31803ccf86..7ee7acbb36 100644 --- a/playbooks/manual/mirrormanager/emergency-expire-repo.yml +++ b/playbooks/manual/mirrormanager/emergency-expire-repo.yml @@ -33,5 +33,5 @@ roles: - role: openshift/job app: mirrormanager - name: emergency-expire-repo-{{ product|lower|replace(" ", "-") }}-{{ version|lower|replace(" ", "-") }} + jobname: emergency-expire-repo-{{ product|lower|replace(" ", "-") }}-{{ version|lower|replace(" ", "-") }} command: "/opt/app-root/bin/mm2_emergency-expire-repo {{ product }} {{ version }} && bash /opt/scripts/update-mirrorlist-cache.sh" diff --git a/playbooks/manual/mirrormanager/move-devel-to-release.yml b/playbooks/manual/mirrormanager/move-devel-to-release.yml index 23230202c0..c15a5061b0 100644 --- a/playbooks/manual/mirrormanager/move-devel-to-release.yml +++ b/playbooks/manual/mirrormanager/move-devel-to-release.yml @@ -26,10 +26,10 @@ - role: openshift/job app: mirrormanager - name: move-devel-to-release-fedora-linux-{{ version|lower|replace(" ", "-") }} + jobname: move-devel-to-release-fedora-linux-{{ version|lower|replace(" ", "-") }} command: "/opt/app-root/bin/mm2_move-devel-to-release --version {{ version }} --category 'Fedora Linux'" - role: openshift/job app: mirrormanager - name: move-devel-to-release-fedora-secondary-{{ version|lower|replace(" ", "-") }} + jobname: move-devel-to-release-fedora-secondary-{{ version|lower|replace(" ", "-") }} command: "/opt/app-root/bin/mm2_move-devel-to-release --version {{ version }} --category 'Fedora Secondary Arches'" diff --git a/playbooks/manual/mirrormanager/move-to-archive.yml b/playbooks/manual/mirrormanager/move-to-archive.yml index ea7bbbb986..46e3725ab5 100644 --- a/playbooks/manual/mirrormanager/move-to-archive.yml +++ b/playbooks/manual/mirrormanager/move-to-archive.yml @@ -33,5 +33,5 @@ roles: - role: openshift/job app: mirrormanager - name: move-to-archive-{{ product|lower|replace(" ", "-") }}-{{ version|lower|replace(" ", "-") }} + jobname: move-to-archive-{{ product|lower|replace(" ", "-") }}-{{ version|lower|replace(" ", "-") }} command: "/opt/app-root/bin/mm2_move-to-archive --product {{ product }} --version {{ version }}" diff --git a/roles/openshift-apps/mirrormanager/templates/job.yml b/roles/openshift-apps/mirrormanager/templates/job.yml index 4f1c6e01c0..321d6631f8 100644 --- a/roles/openshift-apps/mirrormanager/templates/job.yml +++ b/roles/openshift-apps/mirrormanager/templates/job.yml @@ -4,7 +4,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: "job-{{ name }}" + name: "job-{{ jobname }}" spec: parallelism: 1 completions: 1 diff --git a/roles/openshift/job/tasks/main.yml b/roles/openshift/job/tasks/main.yml index 239e1aa923..8fc31d7371 100644 --- a/roles/openshift/job/tasks/main.yml +++ b/roles/openshift/job/tasks/main.yml @@ -1,8 +1,8 @@ -- name: Validate the job name {{ name }} +- name: Validate the job name {{ jobname }} assert: that: - - name is defined - fail_msg: "The 'name' variable is not defined" + - jobname is defined + fail_msg: "The 'jobname' variable is not defined" - name: Validate the command {{ command }} assert: @@ -13,18 +13,18 @@ - name: Copy job template to a temporary file template: src: "{{roles_path}}/openshift-apps/{{app}}/templates/{{template}}" - dest: "/etc/openshift_apps/{{app}}/job-{{name}}.yml" + dest: "/etc/openshift_apps/{{app}}/job-{{jobname}}.yml" - name: Delete previous job (if any) - shell: oc -n {{os_app}} delete --ignore-not-found=true -f /etc/openshift_apps/{{app}}/job-{{name}}.yml + shell: oc -n {{os_app}} delete --ignore-not-found=true -f /etc/openshift_apps/{{app}}/job-{{jobname}}.yml - name: Start job - shell: oc -n {{os_app}} create -f /etc/openshift_apps/{{app}}/job-{{name}}.yml + shell: oc -n {{os_app}} create -f /etc/openshift_apps/{{app}}/job-{{jobname}}.yml - debug: - msg: "Job started. You can watch the logs with: oc -n {{os_app}} logs -f job/job-{{name}}" + msg: "Job started. You can watch the logs with: oc -n {{os_app}} logs -f job/job-{{jobname}}" - debug: - msg: "You can cancel it with: oc -n {{os_app}} delete job/job-{{name}}" + msg: "You can cancel it with: oc -n {{os_app}} delete job/job-{{jobname}}" - name: Wait for job to complete - shell: oc -n {{os_app}} wait job/job-{{name}} --for condition=complete + shell: oc -n {{os_app}} wait job/job-{{jobname}} --for condition=complete