fix circleci pipeline config (#172)

* update docker executor * update docker executor * rollback circleci image * update pipeline config * update pipeline config * update ci pipeline * update ci pipeline * fix linting * fix linting * remove invalid commanders * remove invalid commanders
astronomer · Jan 26, 2025 · 4bc1a06 · 4bc1a06
1 parent f7c5550
commit 4bc1a06
Showing 1 changed file with 17 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,5 +1,13 @@
 ---
 version: 2.1
+executors:
+  docker-executor:
+    environment:
+      GIT_ORG: astronomer
+      DOCKER_REPO: astronomerinc
+    docker:
+      - image: cimg/python:3.10
+
 jobs:
   run_pre_commit:
     docker:
@@ -31,8 +39,7 @@ jobs:
           image_name: ap-certgenerator
           dockerfile: Dockerfile
   scan-trivy:
-    docker:
-      - image: docker:23.0.6-git
+    executor: docker-executor
     steps:
       - trivy-scan:
           image_name: ap-certgenerator
@@ -49,9 +56,9 @@ jobs:
           comma_separated_tags: "$CIRCLE_BRANCH"
           image_name: ap-certgenerator
   functional-test:
-    docker:
-      - image: cimg/python:3.13.1
-    resource_class: large
+    machine:
+      image: ubuntu-2204:2024.05.1
+      resource_class: large
     parameters:
       kube_version:
         type: string
@@ -126,13 +133,7 @@ workflows:
             branches:
               only:
                 - '/release-0\.\d+/'
-executors:
-  docker-executor:
-    environment:
-      GIT_ORG: astronomer
-      DOCKER_REPO: astronomerinc
-    docker:
-      - image: circleci/python:3
+
 commands:
   functional-test:
     description: "Run functional testing for certgenerator"
@@ -150,9 +151,8 @@ commands:
           name: Run component test
           command: |
             set -xe
-            #pyenv global 3.13.1
             sudo apt-get update
-            sudo apt-get install -y libpq-dev python-dev
+            sudo apt-get install -y libpq-dev
             export KUBE_VERSION=<< parameters.kube_version >>
             docker load -i "/tmp/workspace/<< parameters.image_name >>.tar"
             cd tests/functionaltests
@@ -174,7 +174,6 @@ commands:
       - checkout
       - setup_remote_docker:
           docker_layer_caching: true
-          version: docker23
       - run:
           name: Build the Docker image
           command: |
@@ -209,7 +208,7 @@ commands:
     steps:
       - checkout
       - setup_remote_docker:
-          version: docker23
+          docker_layer_caching: true
       - attach_workspace:
           at: /tmp/workspace
       - run:
@@ -218,8 +217,7 @@ commands:
       - run:
           name: Install trivy
           command: |
-            apk add --update-cache --upgrade curl rpm
-            curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contrib/install.sh | sh -s -- -b /usr/local/bin
+            curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/master/contrib/install.sh | sudo sh -s -- -b /usr/local/bin
       - restore_cache:
           keys:
             - trivy-cache
@@ -247,7 +245,7 @@ commands:
       - attach_workspace:
           at: /tmp/workspace
       - setup_remote_docker:
-          version: 20.10.2
+          docker_layer_caching: true
       - run:
           name: Load archived Docker image
           command: docker load -i /tmp/workspace/<< parameters.image_name >>.tar