Moving run steps to a script

.circleci/config.yml

@@ -1347,31 +1347,16 @@ jobs:
             ./ops/scripts/ci-match-values-between-files.sh "<< parameters.file1_path >>" "<< parameters.pattern_file1 >>" "<< parameters.file2_path >>" "<< parameters.pattern_file2 >>"
 
   kontrol-tests:
-    machine:
-      image: ubuntu-2204:2023.07.2
+    docker:
+      - image: <<pipeline.parameters.ci_builder_image>>
     steps:
       - checkout
       - check-changed:
           patterns: contracts-bedrock/test/kontrol,contracts-bedrock/src/L1/OptimismPortal\.sol
       - run:
-          name: Start Docker Container
-          command: |
-            export KONTROL_VERSION=$(cat ../../.kontrolrc)
-            docker run --name optimism-ci \
-                    --rm \
-                    -v $(pwd)/kout/proofs:/home/user/workspace/packages/contracts-bedrock/kout/proofs/ \
-                    --interactive \
-                    --tty \
-                    --detach \
-                    --user root \
-                    --workdir /home/user/workspace \
-                    runtimeverificationinc/kontrol:ubuntu-jammy-${KONTROL_VERSION}
-            docker cp . optimism-ci:/home/user/workspace
-            docker exec optimism-ci chown -R user:user /home/user
-      - run:
-          name: Run Kontrol
+          name: Run Kontrol Tests
           command: |
-            docker exec -u user optimism-ci bash -c 'cd packages/contracts-bedrock && ./test/kontrol/kontrol/run-kontrol.sh'
+            ./packages/contracts-bedrock/scripts/kontrol.sh           
       - run:
           name: Create Results Tar
           command: |

packages/contracts-bedrock/scripts/kontrol.sh

+#!/usr/bin/env bash
+# Setup Kontrol 
+export KONTROL_VERSION=$(cat .kontrolrc)
+docker run --name optimism-ci \
+        --rm \
+        -v $(pwd)/kout/proofs:/home/user/workspace/packages/contracts-bedrock/kout/proofs/ \
+        --interactive \
+        --tty \
+        --detach \
+        --user root \
+        --workdir /home/user/workspace \
+        runtimeverificationinc/kontrol:ubuntu-jammy-${KONTROL_VERSION}
+docker cp . optimism-ci:/home/user/workspace
+docker exec optimism-ci chown -R user:user /home/user
+docker exec -u user optimism-ci bash -c 'cd packages/contracts-bedrock && ./test/kontrol/kontrol/run-kontrol.sh'