From d9ea2ee83b9a0d56551e9340b97db9e280c8bee2 Mon Sep 17 00:00:00 2001 From: Luigi Operoso <40476330+brokenpip3@users.noreply.github.com> Date: Sun, 4 Jun 2023 13:35:14 +0200 Subject: [PATCH] feat: attempt to move restore before seed job creation (#844) --- pkg/configuration/user/reconcile.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/configuration/user/reconcile.go b/pkg/configuration/user/reconcile.go index d5671e2a..303a54cf 100644 --- a/pkg/configuration/user/reconcile.go +++ b/pkg/configuration/user/reconcile.go @@ -56,6 +56,10 @@ func (r *reconcileUserConfiguration) ReconcileCasc() (reconcile.Result, error) { func (r *reconcileUserConfiguration) ReconcileOthers() (reconcile.Result, error) { backupAndRestore := backuprestore.New(r.Configuration, r.logger) + if err := backupAndRestore.Restore(r.jenkinsClient); err != nil { + return reconcile.Result{}, err + } + result, err := r.ensureSeedJobs() if err != nil { return reconcile.Result{}, err @@ -64,10 +68,6 @@ func (r *reconcileUserConfiguration) ReconcileOthers() (reconcile.Result, error) return result, nil } - if err := backupAndRestore.Restore(r.jenkinsClient); err != nil { - return reconcile.Result{}, err - } - if err := backupAndRestore.Backup(false); err != nil { return reconcile.Result{}, err }