[gnome-build-meta/abderrahim/child-pipelines] fixup! WIP: generate deploy configuration

[Abderrahim Kitouni <akitouni src gnome org>]

commit 20e79fd42d833e9eda1b6141e4ef884600cee2a9
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Wed Aug 5 12:41:53 2020 +0100

    fixup! WIP: generate deploy configuration

 .gitlab-ci/flat-manager.yml | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/.gitlab-ci/flat-manager.yml b/.gitlab-ci/flat-manager.yml
index cd32eabe..1bdf626c 100644
--- a/.gitlab-ci/flat-manager.yml
+++ b/.gitlab-ci/flat-manager.yml
@@ -31,7 +31,7 @@ stages:
 
 
 flatmgr-prepare:
-  <<: *x86_64
+  extends: .x86_64
   stage: prepare
   script:
   - curl -O $CI_PROJECT_URL/-/jobs/$TRACK_JOB_ID/artifacts/raw/project.refs
@@ -43,27 +43,33 @@ flatmgr-prepare:
 
 
 flatmgr-x86_64:
-  extends: .flatmgr-template
-  <<: *x86_64
+  extends:
+  - .flatmgr-template
+  - .x86_64
 
 flatmgr-i386:
-  extends: .flatmgr-template
-  <<: *i686
+  extends:
+  - .flatmgr-template
+  - .i686
 
 flatmgr-aarch64:
-  extends: .flatmgr-template
-  <<: *aarch64
+  extends:
+  - .flatmgr-template
+  - .aarch64
 
 flatmgr-arm:
-  extends: .flatmgr-template
-  <<: *arm
+  extends:
+  - .flatmgr-template
+  - .arm
 
 flatmgr-ppc64le:
-  extends: .flatmgr-template
-  <<: *ppc64le
+  extends:
+  - .flatmgr-template
+  - .ppc64le
 
 
 flatmgr-finish:
+  extends: .x86_64
   stage: finish
   dependencies: [flatmgr-prepare]
   script:
@@ -71,12 +77,11 @@ flatmgr-finish:
   - flat-manager-client publish --wait $(cat build.txt)
   after_script:
   - flat-manager-client purge $(cat build.txt)
-  <<: *x86_64
 
 flatmgr-finish-failed:
+  extends: .x86_64
   stage: finish
   dependencies: [flatmgr-prepare]
   script:
   - flat-manager-client purge $(cat build.txt)
   when: on_failure
-  <<: *x86_64