Merge branch 'lvpeschke/less-celotool' of ssh://github.com/celo-org/c…

…elo-monorepo into lvpeschke/less-celotool
celo-org · Sep 18, 2023 · a782eb7 · a782eb7
2 parents 4eba9aa + 87ee963
commit a782eb7
Show file tree

Hide file tree

Showing 25 changed files with 12 additions and 598 deletions.
diff --git a/.env b/.env
@@ -58,10 +58,6 @@ TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-m
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-dc5e5dfa07231a4ff4664816a95eae606293eae9"
 TRANSACTION_METRICS_EXPORTER_SUFFIX='1'
 
-EKSPORTISTO_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/eksportisto"
-EKSPORTISTO_DOCKER_IMAGE_TAG="12f9f9e822ea35db2f965be616abef126f1724fb"
-EKSPORTISTO_SUFFIX='1'
-
 # Genesis Vars
 NETWORK_ID=1101
 CONSENSUS_TYPE="istanbul"

diff --git a/.env.alfajores b/.env.alfajores
@@ -74,10 +74,6 @@ MOCK_ORACLE_DOCKER_IMAGE_TAG="default"
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-f4a55e143932ea559cf4bcbd9bcccc14da43d6ed"
 
-EKSPORTISTO_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/eksportisto"
-EKSPORTISTO_DOCKER_IMAGE_TAG="c88f7e8babcdb01062a6a12ae729705ba9769add"
-EKSPORTISTO_SUFFIX='1'
-
 # Genesis Vars
 NETWORK_ID=44787
 CONSENSUS_TYPE="istanbul"

diff --git a/.env.baklava b/.env.baklava
@@ -129,10 +129,6 @@ GCP_FORNO_EUROPE_WEST1_PROM_SIDECAR_DISABLED="true"
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-dc5e5dfa07231a4ff4664816a95eae606293eae9"
 
-EKSPORTISTO_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/eksportisto"
-EKSPORTISTO_DOCKER_IMAGE_TAG="b199a634866ef34c4fa1925381dff4de40eb0a3c"
-EKSPORTISTO_SUFFIX='1'
-
 # Genesis Vars
 NETWORK_ID=62320
 CONSENSUS_TYPE="istanbul"

diff --git a/.env.rc1 b/.env.rc1
@@ -237,10 +237,6 @@ GCP_PRIVATE_TXNODES_FULL_NODES_WS_PORT="8545"
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-f4a55e143932ea559cf4bcbd9bcccc14da43d6ed"
 
-EKSPORTISTO_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/eksportisto"
-EKSPORTISTO_DOCKER_IMAGE_TAG="41fd75246c7108716be373d2d36cac13996034fc"
-EKSPORTISTO_SUFFIX=''
-
 # Genesis Vars
 NETWORK_ID=42220
 CONSENSUS_TYPE="istanbul"

diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml
@@ -364,7 +364,7 @@ jobs:
       - name: Execute matrix command for test
         uses: nick-fields/retry@v2
         with:
-          timeout_minutes: 30
+          timeout_minutes: 40
           max_attempts: 3
           command: |
             ${{ matrix.command }}

diff --git a/packages/celotool/src/cmds/deploy/destroy/eksportisto.ts b/packages/celotool/src/cmds/deploy/destroy/eksportisto.ts
diff --git a/packages/celotool/src/cmds/deploy/initial/eksportisto.ts b/packages/celotool/src/cmds/deploy/initial/eksportisto.ts
diff --git a/packages/celotool/src/cmds/deploy/upgrade/eksportisto.ts b/packages/celotool/src/cmds/deploy/upgrade/eksportisto.ts
diff --git a/packages/celotool/src/lib/eksportisto.ts b/packages/celotool/src/lib/eksportisto.ts
diff --git a/packages/celotool/src/lib/env-utils.ts b/packages/celotool/src/lib/env-utils.ts
@@ -40,9 +40,6 @@ export enum envVar {
   CONTEXTS = 'CONTEXTS',
   DONUT_BLOCK = 'DONUT_BLOCK',
   E2E_TESTS_FORCE_USE_MYCELO = 'E2E_TESTS_FORCE_USE_MYCELO',
-  EKSPORTISTO_DOCKER_IMAGE_REPOSITORY = 'EKSPORTISTO_DOCKER_IMAGE_REPOSITORY',
-  EKSPORTISTO_DOCKER_IMAGE_TAG = 'EKSPORTISTO_DOCKER_IMAGE_TAG',
-  EKSPORTISTO_SUFFIX = 'EKSPORTISTO_SUFFIX',
   ENV_TYPE = 'ENV_TYPE',
   EPOCH = 'EPOCH',
   ESPRESSO_BLOCK = 'ESPRESSO_BLOCK',

diff --git a/packages/helm-charts/eksportisto/Chart.yaml b/packages/helm-charts/eksportisto/Chart.yaml