Prefix openshift/job

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2024-11-28 17:48:13 +01:00
parent 4a4e7e07cb
commit 39f2e86658
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD
6 changed files with 28 additions and 28 deletions

View file

@ -33,6 +33,6 @@
roles: roles:
- role: openshift/job - role: openshift/job
app: mirrormanager job_app: mirrormanager
jobname: emergency-expire-repo-{{ product|lower|replace(" ", "-") }}-{{ version|lower|replace(" ", "-") }} job_name: 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" job_command: "/opt/app-root/bin/mm2_emergency-expire-repo {{ product }} {{ version }} && bash /opt/scripts/update-mirrorlist-cache.sh"

View file

@ -26,11 +26,11 @@
roles: roles:
- role: openshift/job - role: openshift/job
app: mirrormanager job_app: mirrormanager
jobname: move-devel-to-release-fedora-linux-{{ version|lower|replace(" ", "-") }} job_name: move-devel-to-release-fedora-linux-{{ version|lower|replace(" ", "-") }}
command: "/opt/app-root/bin/mm2_move-devel-to-release --version {{ version }} --category 'Fedora Linux'" job_command: "/opt/app-root/bin/mm2_move-devel-to-release --version {{ version }} --category 'Fedora Linux'"
- role: openshift/job - role: openshift/job
app: mirrormanager job_app: mirrormanager
jobname: move-devel-to-release-fedora-secondary-{{ version|lower|replace(" ", "-") }} job_name: 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'" job_command: "/opt/app-root/bin/mm2_move-devel-to-release --version {{ version }} --category 'Fedora Secondary Arches'"

View file

@ -33,6 +33,6 @@
roles: roles:
- role: openshift/job - role: openshift/job
app: mirrormanager job_app: mirrormanager
jobname: move-to-archive-{{ product|lower|replace(" ", "-") }}-{{ version|lower|replace(" ", "-") }} job_name: move-to-archive-{{ product|lower|replace(" ", "-") }}-{{ version|lower|replace(" ", "-") }}
command: "/opt/app-root/bin/mm2_move-to-archive --product {{ product }} --version {{ version }}" job_command: "/opt/app-root/bin/mm2_move-to-archive --product {{ product }} --version {{ version }}"

View file

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

View file

@ -1,3 +1,3 @@
--- ---
os_app: "{{app}}" os_app: "{{job_app}}"
template: job.yml job_template: job.yml

View file

@ -1,31 +1,31 @@
--- ---
- name: Validate the job name {{ jobname }} - name: Validate the job name {{ job_name }}
assert: assert:
that: that:
- jobname is defined - job_name is defined
fail_msg: "The 'jobname' variable is not defined" fail_msg: "The 'job_name' variable is not defined"
- name: Validate the command {{ command }} - name: Validate the command {{ job_command }}
assert: assert:
that: that:
- command is defined - job_command is defined
fail_msg: "The 'command' variable is not defined" fail_msg: "The 'job_command' variable is not defined"
- name: Copy job template to a temporary file - name: Copy job template to a temporary file
template: template:
src: "{{roles_path}}/openshift-apps/{{app}}/templates/{{template}}" src: "{{roles_path}}/openshift-apps/{{job_app}}/templates/{{job_template}}"
dest: "/etc/openshift_apps/{{app}}/job-{{jobname}}.yml" dest: "/etc/openshift_apps/{{job_app}}/job-{{job_name}}.yml"
- name: Delete previous job (if any) - name: Delete previous job (if any)
shell: oc -n {{os_app}} delete --ignore-not-found=true -f /etc/openshift_apps/{{app}}/job-{{jobname}}.yml shell: oc -n {{os_app}} delete --ignore-not-found=true -f /etc/openshift_apps/{{job_app}}/job-{{job_name}}.yml
- name: Start job - name: Start job
shell: oc -n {{os_app}} create -f /etc/openshift_apps/{{app}}/job-{{jobname}}.yml shell: oc -n {{os_app}} create -f /etc/openshift_apps/{{job_app}}/job-{{job_name}}.yml
- debug: - debug:
msg: "Job started. You can watch the logs with: oc -n {{os_app}} logs -f job/job-{{jobname}}" msg: "Job started. You can watch the logs with: oc -n {{os_app}} logs -f job/job-{{job_name}}"
- debug: - debug:
msg: "You can cancel it with: oc -n {{os_app}} delete job/job-{{jobname}}" msg: "You can cancel it with: oc -n {{os_app}} delete job/job-{{job_name}}"
- name: Wait for job to complete - name: Wait for job to complete
shell: oc -n {{os_app}} wait job/job-{{jobname}} --for condition=complete shell: oc -n {{os_app}} wait job/job-{{job_name}} --for condition=complete