infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

name is a reserved variable

Browse source 
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2024-11-18 17:33:27 +01:00
parent 102f58b74f
commit 692b98ece0
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/manual/mirrormanager/emergency-expire-repo.yml
View file

@ -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"

4
playbooks/manual/mirrormanager/move-devel-to-release.yml
View file

@ -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'"

2
playbooks/manual/mirrormanager/move-to-archive.yml
View file

@ -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 }}"

2
roles/openshift-apps/mirrormanager/templates/job.yml
View file

@ -4,7 +4,7 @@
apiVersion: batch/v1
kind: Job
metadata:
name: "job-{{ name }}"
name: "job-{{ jobname }}"
spec:
parallelism: 1
completions: 1

18
roles/openshift/job/tasks/main.yml
View file

@ -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