Skip to content

Commit 6379fb6

Browse files
roger-ryaoyangchiu
authored andcommitted
test(robot): Merge recurring job creation functions
Merged `create_snapshot_recurringjob_for_volume`, `create_backup_recurringjob_for_volume`, and `create_recurringjob_for_volume` into a single function `create_recurringjob_for_volume` to reduce redundancy and improve maintainability. longhorn/longhorn#10711 Signed-off-by: Roger Yao <roger.yao@suse.com>
1 parent 66085f7 commit 6379fb6

2 files changed

Lines changed: 2 additions & 17 deletions

File tree

e2e/keywords/recurringjob.resource

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ Create ${job_task} recurringjob ${job_id}
1313
create_recurringjob ${job_name} ${job_task} &{args}
1414

1515
Create snapshot and backup recurringjob for volume ${volume_id}
16-
${volume_name} = generate_name_with_suffix volume ${volume_id}
17-
create_snapshot_recurringjob_for_volume ${volume_name}
18-
create_backup_recurringjob_for_volume ${volume_name}
16+
Create recurringjob for volume ${volume_id} with task=snapshot
17+
Create recurringjob for volume ${volume_id} with task=backup
1918

2019
Create recurringjob for volume ${volume_id} with
2120
[Arguments] &{config}

e2e/libs/keywords/recurringjob_keywords.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,6 @@ def create_recurringjob(self, job_name, task, groups="[]", cron="*/2 * * * *", c
2828
logging(f"Creating recurringjob {job_name}, task={task}, groups={groups}, cron={cron}, concurrency={concurrency}, labels={labels}")
2929
self.recurringjob.create(job_name, task=task, groups=groups, cron=cron, concurrency=concurrency, labels=labels)
3030

31-
def create_snapshot_recurringjob_for_volume(self, volume_name):
32-
job_name = volume_name + '-snap'
33-
34-
logging(f'Creating snapshot recurringjob {job_name} for volume {volume_name}')
35-
self.recurringjob.create(job_name, task="snapshot")
36-
self.recurringjob.add_to_volume(job_name, volume_name)
37-
38-
def create_backup_recurringjob_for_volume(self, volume_name):
39-
job_name = volume_name + '-bak'
40-
41-
logging(f'Creating backup recurringjob {job_name} for volume {volume_name}')
42-
self.recurringjob.create(job_name, task="backup")
43-
self.recurringjob.add_to_volume(job_name, volume_name)
44-
4531
def create_recurringjob_for_volume(self, volume_name, task, cron="*/2 * * * *"):
4632
job_name = volume_name + '-' + task
4733

0 commit comments

Comments
 (0)