particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro: deduplicate groupStageOptions() in RHEL pipelines

Browse source 
Use single NewGroupsStageOptions() from osbuild1 and osbuild2 instead of
implementing in each distro.
- Followup from 2eef6e6e2d, copied to the
  rest of the RHEL distro definitions.
- Added NewGroupsStageOptions() to osbuild1 for rhel8 and rhel84.

NB: The change was not made in the Fedora distro definitions as they are
    currently being rewritten.
This commit is contained in:
Achilleas Koutsou 2022-03-30 18:56:18 +02:00 • committed by Christian Kellner
parent 333bec57ef
commit 42364f2cc6
26 changed files with 26 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/data/manifests/rhel_8-aarch64-qcow2_customize-boot.json
View file

@ -3560,11 +3560,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_8-ppc64le-qcow2_customize-boot.json
View file

@ -3839,11 +3839,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_8-s390x-qcow2_customize-boot.json
View file

@ -3760,11 +3760,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_8-x86_64-qcow2_customize-boot.json
View file

@ -3542,11 +3542,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_84-aarch64-qcow2_customize-boot.json
View file

@ -3569,11 +3569,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_84-ppc64le-qcow2_customize-boot.json
View file

@ -3848,11 +3848,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_84-s390x-qcow2_customize-boot.json
View file

@ -3786,11 +3786,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_84-x86_64-qcow2_customize-boot.json
View file

@ -3609,11 +3609,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json
View file

@ -917,11 +917,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json
View file

@ -970,11 +970,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json
View file

@ -1010,11 +1010,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_85-x86_64-image_installer_with_users-boot.json
View file

@ -920,11 +920,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json
View file

@ -930,11 +930,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_90_beta-aarch64-qcow2_customize-boot.json
View file

@ -843,11 +843,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_90_beta-ppc64le-qcow2_customize-boot.json
View file

@ -906,11 +906,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_90_beta-s390x-qcow2_customize-boot.json
View file

@ -993,11 +993,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_90_beta-x86_64-image_installer_with_users-boot.json
View file

@ -880,11 +880,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}

2
test/data/manifests/rhel_90_beta-x86_64-qcow2_customize-boot.json
View file

@ -874,11 +874,9 @@
"options": {
"groups": {
"group1": {
"name": "group1",
"gid": 1030
},
"group2": {
"name": "group2",
"gid": 1050
}
}