From cd409ff5972c8096f3d98780e492879928603d88 Mon Sep 17 00:00:00 2001
From: Marian Steinbach <marian@giantswarm.io>
Date: Wed, 29 Nov 2023 16:38:18 +0100
Subject: [PATCH] Update CircleCI configuration for pushing to container
 registries (#185)

* Add CircleCI image registry configuration

* Don't make acceptance tests required

---------

Co-authored-by: Jose Armesto <github@armesto.net>
---
 .circleci/config.yml | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 259c4b7..9c23344 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  architect: giantswarm/architect@4.31.0
+  architect: giantswarm/architect@4.35.5
 
 jobs:
   unit-tests:
@@ -55,38 +55,19 @@ workflows:
           requires:
             - unit-tests
             - integration-tests
-            - acceptance-tests
           filters:
             tags:
               only: /^v.*/
 
-      - architect/push-to-docker:
+      - architect/push-to-registries:
           context: architect
-          name: push-aws-network-topology-operator-to-quay
-          image: "quay.io/giantswarm/aws-network-topology-operator"
-          username_envar: "QUAY_USERNAME"
-          password_envar: "QUAY_PASSWORD"
-          requires:
-          - go-build
-          filters:
-            # Trigger the job also on git tag.
-            tags:
-              only: /^v.*/
-      - architect/push-to-docker:
-          context: "architect"
-          name: push-aws-network-topology-operator-to-docker
-          image: "docker.io/giantswarm/aws-network-topology-operator"
-          username_envar: "DOCKER_USERNAME"
-          password_envar: "DOCKER_PASSWORD"
+          name: push-to-registries
           requires:
             - go-build
-          # Needed to trigger job also on git tag.
           filters:
+            # Trigger the job also on git tag.
             tags:
               only: /^v.*/
-
-      # Ensure that for every commit
-      # there is an app version in the test catalog.
       - architect/push-to-app-catalog:
           context: architect
           name: push-to-app-catalog
@@ -94,8 +75,7 @@ workflows:
           app_catalog_test: "control-plane-test-catalog"
           chart: "aws-network-topology-operator"
           requires:
-          - push-aws-network-topology-operator-to-quay
-          - push-aws-network-topology-operator-to-docker
+            - push-to-registries
           filters:
             # Trigger the job also on git tag.
             tags:
@@ -106,9 +86,8 @@ workflows:
           app_name: "aws-network-topology-operator"
           app_collection_repo: "capa-app-collection"
           requires:
-            - push-aws-network-topology-operator-to-docker
-            - push-aws-network-topology-operator-to-quay
             - push-to-app-catalog
+            - push-to-registries
           filters:
             branches:
               ignore: /.*/