fix: remove e2e flakiness by making the loop deterministic

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>
This commit is contained in:
AhmedGrati 2023-10-24 16:31:22 +01:00
parent 3172bc05b5
commit 0a3b1897c0
2 changed files with 17 additions and 16 deletions

View File

@ -686,14 +686,15 @@ func getServiceGroupID(service kobject.ServiceConfig, mode string) string {
// A warn/info message should be printed to let the user know. // A warn/info message should be printed to let the user know.
func KomposeObjectToServiceConfigGroupMapping(komposeObject *kobject.KomposeObject, opt kobject.ConvertOptions) map[string]kobject.ServiceConfigGroup { func KomposeObjectToServiceConfigGroupMapping(komposeObject *kobject.KomposeObject, opt kobject.ConvertOptions) map[string]kobject.ServiceConfigGroup {
serviceConfigGroup := make(map[string]kobject.ServiceConfigGroup) serviceConfigGroup := make(map[string]kobject.ServiceConfigGroup)
sortedServiceConfigs := SortedKeys(komposeObject.ServiceConfigs)
for name, service := range komposeObject.ServiceConfigs { for _, service := range sortedServiceConfigs {
groupID := getServiceGroupID(service, opt.ServiceGroupMode) serviceConfig := komposeObject.ServiceConfigs[service]
groupID := getServiceGroupID(serviceConfig, opt.ServiceGroupMode)
if groupID != "" { if groupID != "" {
service.Name = name serviceConfig.Name = service
service.InGroup = true serviceConfig.InGroup = true
serviceConfigGroup[groupID] = append(serviceConfigGroup[groupID], service) serviceConfigGroup[groupID] = append(serviceConfigGroup[groupID], serviceConfig)
komposeObject.ServiceConfigs[name] = service komposeObject.ServiceConfigs[service] = serviceConfig
} }
} }

View File

@ -39,6 +39,14 @@ spec:
io.kompose.service: librenms-dispatcher io.kompose.service: librenms-dispatcher
spec: spec:
containers: containers:
- env:
- name: TZ
image: librenms/dispatcher:latest
name: dispatcher
resources: {}
volumeMounts:
- mountPath: /data
name: librenms-dispatcher-claim0
- env: - env:
- name: TZ - name: TZ
image: librenms/librenms:latest image: librenms/librenms:latest
@ -51,15 +59,7 @@ spec:
volumeMounts: volumeMounts:
- mountPath: /data - mountPath: /data
name: librenms-dispatcher-claim0 name: librenms-dispatcher-claim0
- env: hostname: librenms
- name: TZ
image: librenms/dispatcher:latest
name: dispatcher
resources: {}
volumeMounts:
- mountPath: /data
name: librenms-dispatcher-claim0
hostname: dispatcher
restartPolicy: Always restartPolicy: Always
volumes: volumes:
- name: librenms-dispatcher-claim0 - name: librenms-dispatcher-claim0