From 3a0e19b4f4f0cac2124cbc7ab081605ffcd8e40b Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 15:45:12 +0300 Subject: [PATCH 01/28] Enable builder on this branch + limit to only 3 images --- .circleci/config.yml | 1 + build/images.sh | 46 ++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5567caf978..68681a0a29 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -209,6 +209,7 @@ workflows: branches: only: - master + - fix-circle-ci-builds - /^[0-9]+\.[0-9]+$/ nightly: triggers: diff --git a/build/images.sh b/build/images.sh index 32a3f1b661..5747a8579b 100644 --- a/build/images.sh +++ b/build/images.sh @@ -21,32 +21,32 @@ set -euo pipefail dev_images=( "manager" - "proxy" - "async-gateway" - "enqueuer" - "dequeuer" + # "proxy" + # "async-gateway" + # "enqueuer" + # "dequeuer" ) non_dev_images=( - "cluster-autoscaler" - "operator" - "controller-manager" - "istio-proxy" - "istio-pilot" - "fluent-bit" - "prometheus" - "prometheus-config-reloader" - "prometheus-operator" - "prometheus-statsd-exporter" - "prometheus-dcgm-exporter" - "prometheus-kube-state-metrics" - "prometheus-node-exporter" - "kube-rbac-proxy" - "grafana" - "event-exporter" - "metrics-server" - "inferentia" - "nvidia" + # "cluster-autoscaler" + # "operator" + # "controller-manager" + # "istio-proxy" + # "istio-pilot" + # "fluent-bit" + # "prometheus" + # "prometheus-config-reloader" + # "prometheus-operator" + # "prometheus-statsd-exporter" + # "prometheus-dcgm-exporter" + # "prometheus-kube-state-metrics" + # "prometheus-node-exporter" + # "kube-rbac-proxy" + # "grafana" + # "event-exporter" + # "metrics-server" + # "inferentia" + # "nvidia" "kubexit" ) From d8c118a75161a435c3afe2ca0d464d8738e908b6 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 15:46:34 +0300 Subject: [PATCH 02/28] Disable tests temporarily --- .circleci/config.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 68681a0a29..7dab73e550 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -192,19 +192,19 @@ jobs: workflows: build: jobs: - - test - - build-and-deploy-approval: - type: approval - requires: - - test - filters: - branches: - only: - - /^[0-9]+\.[0-9]+$/ + # - test + # - build-and-deploy-approval: + # type: approval + # requires: + # - test + # filters: + # branches: + # only: + # - /^[0-9]+\.[0-9]+$/ - build-and-deploy: - requires: - - test - - build-and-deploy-approval + # requires: + # - test + # - build-and-deploy-approval filters: branches: only: From 9539511f788f2cfacb4170aec69dad9f48a47612 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 15:56:06 +0300 Subject: [PATCH 03/28] Experiment 1 --- .circleci/config.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7dab73e550..cd5fa1f6a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -114,12 +114,15 @@ jobs: build-and-deploy: docker: - - image: circleci/python:3.6 + - image: cimg/base:stable steps: - - setup_remote_docker + - setup_remote_docker: + version: 19.03.14 - checkout - install-go - - run: docker buildx create --name builder --platform linux/amd64,linux/arm64 --use && docker buildx inspect --bootstrap + - run: | + export DOCKER_CLI_EXPERIMENTAL=enabled + docker buildx create --name builder --platform linux/amd64,linux/arm64 --use && docker buildx inspect --bootstrap - run: sudo pip install awscli - run: make ci-build-cli - return-if-not-deployed-branch From 29dd6f43c3a6bcea811116b94379db12a0c7aba5 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 16:01:55 +0300 Subject: [PATCH 04/28] Experiment 2 --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index cd5fa1f6a6..9e5bbe0fb0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -122,6 +122,7 @@ jobs: - install-go - run: | export DOCKER_CLI_EXPERIMENTAL=enabled + docker context ls docker buildx create --name builder --platform linux/amd64,linux/arm64 --use && docker buildx inspect --bootstrap - run: sudo pip install awscli - run: make ci-build-cli From e0fca6de6ce5866e8876f49811af5d8c8134a1bd Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 16:04:24 +0300 Subject: [PATCH 05/28] Experiment 3 --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9e5bbe0fb0..dfafff1da8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -122,6 +122,7 @@ jobs: - install-go - run: | export DOCKER_CLI_EXPERIMENTAL=enabled + export DOCKER_CONTEXT=default docker context ls docker buildx create --name builder --platform linux/amd64,linux/arm64 --use && docker buildx inspect --bootstrap - run: sudo pip install awscli From ab9514607a49bfa7af7b9ae603cd9b8deb038a9b Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 16:05:40 +0300 Subject: [PATCH 06/28] Experiment 4 --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index dfafff1da8..11a3d24fa7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -123,6 +123,7 @@ jobs: - run: | export DOCKER_CLI_EXPERIMENTAL=enabled export DOCKER_CONTEXT=default + unset DOCKER_HOST docker context ls docker buildx create --name builder --platform linux/amd64,linux/arm64 --use && docker buildx inspect --bootstrap - run: sudo pip install awscli From bc8750227c6da7e2b5a74c34a2223ec723a9b3c6 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 16:10:25 +0300 Subject: [PATCH 07/28] Experiment 5 --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 11a3d24fa7..03221763a2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -124,7 +124,8 @@ jobs: export DOCKER_CLI_EXPERIMENTAL=enabled export DOCKER_CONTEXT=default unset DOCKER_HOST - docker context ls + docker context ls + docker buildx ls docker buildx create --name builder --platform linux/amd64,linux/arm64 --use && docker buildx inspect --bootstrap - run: sudo pip install awscli - run: make ci-build-cli From 68a00ca64b576050b69ef6c1bfe50a5486ffc9b6 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 16:21:14 +0300 Subject: [PATCH 08/28] Experiment 6 --- .circleci/config.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 03221763a2..ef01567272 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -115,22 +115,20 @@ jobs: build-and-deploy: docker: - image: cimg/base:stable + environment: + DOCKER_CLI_EXPERIMENTAL: enabled + DOCKER_CONTEXT: default steps: - setup_remote_docker: version: 19.03.14 - checkout - install-go - - run: | - export DOCKER_CLI_EXPERIMENTAL=enabled - export DOCKER_CONTEXT=default - unset DOCKER_HOST - docker context ls - docker buildx ls - docker buildx create --name builder --platform linux/amd64,linux/arm64 --use && docker buildx inspect --bootstrap - - run: sudo pip install awscli - - run: make ci-build-cli - - return-if-not-deployed-branch - - run: make ci-build-and-upload-cli + # - run: | + # docker buildx create --name builder --platform linux/amd64,linux/arm64 --use && docker buildx inspect --bootstrap + # - run: sudo pip install awscli + # - run: make ci-build-cli + # - return-if-not-deployed-branch + # - run: make ci-build-and-upload-cli - run: make ci-build-images - quay-login - run: From 2ac5ded7057e6ed809cc157c1a40c38a48a647af Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 16:25:50 +0300 Subject: [PATCH 09/28] Experiment 7 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ef01567272..2150eb3bbe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -123,8 +123,8 @@ jobs: version: 19.03.14 - checkout - install-go - # - run: | - # docker buildx create --name builder --platform linux/amd64,linux/arm64 --use && docker buildx inspect --bootstrap + - run: | + docker buildx create --name builder --platform linux/amd64,linux/arm64 --use default && docker buildx inspect --bootstrap # - run: sudo pip install awscli # - run: make ci-build-cli # - return-if-not-deployed-branch From ec360b42e63ca2f997ed2518ac80de51f380f288 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 16:28:55 +0300 Subject: [PATCH 10/28] Experiment 8 --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2150eb3bbe..4cc80b146b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -118,6 +118,7 @@ jobs: environment: DOCKER_CLI_EXPERIMENTAL: enabled DOCKER_CONTEXT: default + DOCKER_TLS_VERIFY: 0 steps: - setup_remote_docker: version: 19.03.14 From 0490496c23ecefa4c942d3044be35c7a288f693b Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 16:59:16 +0300 Subject: [PATCH 11/28] Experiment 9 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4cc80b146b..c2f225c389 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -125,7 +125,7 @@ jobs: - checkout - install-go - run: | - docker buildx create --name builder --platform linux/amd64,linux/arm64 --use default && docker buildx inspect --bootstrap + docker buildx create --name builder --platform linux/amd64,linux/arm64 --use $DOCKER_HOST && docker buildx inspect --bootstrap # - run: sudo pip install awscli # - run: make ci-build-cli # - return-if-not-deployed-branch From 089084df5f0de3398190231f418cffa88085b475 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:00:34 +0300 Subject: [PATCH 12/28] Experiment 10 --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c2f225c389..ba2a1e28e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -125,6 +125,7 @@ jobs: - checkout - install-go - run: | + docker context ls docker buildx create --name builder --platform linux/amd64,linux/arm64 --use $DOCKER_HOST && docker buildx inspect --bootstrap # - run: sudo pip install awscli # - run: make ci-build-cli From e2c281806230175ca47a816342e2428ef2df5156 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:26:59 +0300 Subject: [PATCH 13/28] Experiment 11 --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ba2a1e28e7..4697523889 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -125,8 +125,9 @@ jobs: - checkout - install-go - run: | - docker context ls - docker buildx create --name builder --platform linux/amd64,linux/arm64 --use $DOCKER_HOST && docker buildx inspect --bootstrap + ls $DOCKER_CERT_PATH + docker context create custom-context --default-stack-orchestrator swarm --docker "host=$DOCKER_HOST" + docker buildx create --name builder --platform linux/amd64,linux/arm64 --use custom-context && docker buildx inspect --bootstrap # - run: sudo pip install awscli # - run: make ci-build-cli # - return-if-not-deployed-branch From b6eb35e70f58eb90ca6a4982351c1420ecf1da35 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:28:53 +0300 Subject: [PATCH 14/28] Experiment 12 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4697523889..e43a204965 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -126,7 +126,7 @@ jobs: - install-go - run: | ls $DOCKER_CERT_PATH - docker context create custom-context --default-stack-orchestrator swarm --docker "host=$DOCKER_HOST" + docker context create custom-context --default-stack-orchestrator swarm --docker "host=$DOCKER_HOST,ca=$DOCKER_CERT_PATH/ca.pem,cert=$DOCKER_CERT_PATH/cert.pem,key=$DOCKER_CERT_PATH/key.pem" docker buildx create --name builder --platform linux/amd64,linux/arm64 --use custom-context && docker buildx inspect --bootstrap # - run: sudo pip install awscli # - run: make ci-build-cli From dfe77fe3d9a3cb1a048141819245436af8ca97d8 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:31:36 +0300 Subject: [PATCH 15/28] Experiment 13 --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e43a204965..25d223cf6f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -118,16 +118,16 @@ jobs: environment: DOCKER_CLI_EXPERIMENTAL: enabled DOCKER_CONTEXT: default - DOCKER_TLS_VERIFY: 0 steps: - setup_remote_docker: version: 19.03.14 - checkout - install-go - - run: | - ls $DOCKER_CERT_PATH - docker context create custom-context --default-stack-orchestrator swarm --docker "host=$DOCKER_HOST,ca=$DOCKER_CERT_PATH/ca.pem,cert=$DOCKER_CERT_PATH/cert.pem,key=$DOCKER_CERT_PATH/key.pem" - docker buildx create --name builder --platform linux/amd64,linux/arm64 --use custom-context && docker buildx inspect --bootstrap + - run: + name: Configure Docker Buildx + command: | + docker context create custom-context --default-stack-orchestrator swarm --docker "host=$DOCKER_HOST,ca=$DOCKER_CERT_PATH/ca.pem,cert=$DOCKER_CERT_PATH/cert.pem,key=$DOCKER_CERT_PATH/key.pem" + docker buildx create --name builder --platform linux/amd64,linux/arm64 --use custom-context && docker buildx inspect --bootstrap # - run: sudo pip install awscli # - run: make ci-build-cli # - return-if-not-deployed-branch From 34a5a6b3eaa64427711ff33ce8f8a42db3e1ab65 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:33:52 +0300 Subject: [PATCH 16/28] Experiment 14 --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 25d223cf6f..c4015561b4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -128,10 +128,10 @@ jobs: command: | docker context create custom-context --default-stack-orchestrator swarm --docker "host=$DOCKER_HOST,ca=$DOCKER_CERT_PATH/ca.pem,cert=$DOCKER_CERT_PATH/cert.pem,key=$DOCKER_CERT_PATH/key.pem" docker buildx create --name builder --platform linux/amd64,linux/arm64 --use custom-context && docker buildx inspect --bootstrap - # - run: sudo pip install awscli - # - run: make ci-build-cli - # - return-if-not-deployed-branch - # - run: make ci-build-and-upload-cli + - run: sudo pip install awscli + - run: make ci-build-cli + - return-if-not-deployed-branch + - run: make ci-build-and-upload-cli - run: make ci-build-images - quay-login - run: From d1496643fcfba70f07cf755d01929ddc8504b3cb Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:35:39 +0300 Subject: [PATCH 17/28] Experiment 15 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c4015561b4..8f053e7640 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -114,7 +114,7 @@ jobs: build-and-deploy: docker: - - image: cimg/base:stable + - image: circleci/python:3.6 environment: DOCKER_CLI_EXPERIMENTAL: enabled DOCKER_CONTEXT: default From cec94ea9e4b4c61ec9985be685f1de76858897de Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:39:55 +0300 Subject: [PATCH 18/28] Experiment 16 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8f053e7640..e8599d2e78 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -114,7 +114,7 @@ jobs: build-and-deploy: docker: - - image: circleci/python:3.6 + - image: cimg/python:3.6 environment: DOCKER_CLI_EXPERIMENTAL: enabled DOCKER_CONTEXT: default From 61ad212608f82317ec6ae7c8181ac89a9fa1cbc8 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:43:50 +0300 Subject: [PATCH 19/28] Experiment 17 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e8599d2e78..0a0ba7e1d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -128,7 +128,7 @@ jobs: command: | docker context create custom-context --default-stack-orchestrator swarm --docker "host=$DOCKER_HOST,ca=$DOCKER_CERT_PATH/ca.pem,cert=$DOCKER_CERT_PATH/cert.pem,key=$DOCKER_CERT_PATH/key.pem" docker buildx create --name builder --platform linux/amd64,linux/arm64 --use custom-context && docker buildx inspect --bootstrap - - run: sudo pip install awscli + - run: pip install awscli - run: make ci-build-cli - return-if-not-deployed-branch - run: make ci-build-and-upload-cli From 652145b27d51f0f8219fe5e597d1912a34437df4 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:45:31 +0300 Subject: [PATCH 20/28] Experiment 18 --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a0ba7e1d0..ce6c5f13fd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -119,8 +119,7 @@ jobs: DOCKER_CLI_EXPERIMENTAL: enabled DOCKER_CONTEXT: default steps: - - setup_remote_docker: - version: 19.03.14 + - setup_remote_docker - checkout - install-go - run: From ca2dcf7c99c01659107d894393e6e967225597ab Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:47:41 +0300 Subject: [PATCH 21/28] Experiment 19 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ce6c5f13fd..2724a800f3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -128,9 +128,9 @@ jobs: docker context create custom-context --default-stack-orchestrator swarm --docker "host=$DOCKER_HOST,ca=$DOCKER_CERT_PATH/ca.pem,cert=$DOCKER_CERT_PATH/cert.pem,key=$DOCKER_CERT_PATH/key.pem" docker buildx create --name builder --platform linux/amd64,linux/arm64 --use custom-context && docker buildx inspect --bootstrap - run: pip install awscli - - run: make ci-build-cli - - return-if-not-deployed-branch - - run: make ci-build-and-upload-cli + # - run: make ci-build-cli + # - return-if-not-deployed-branch + # - run: make ci-build-and-upload-cli - run: make ci-build-images - quay-login - run: From 8127699ddeedaeec7608b45efe3c88530df2291b Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:49:25 +0300 Subject: [PATCH 22/28] Experiment 20 --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2724a800f3..b34e4f365f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -142,7 +142,7 @@ jobs: e2e-tests: docker: - - image: circleci/python:3.6 + - image: cimg/python:3.6 environment: CORTEX_TEST_BATCH_S3_PATH: s3://cortex-nightly-artifacts/test/jobs steps: @@ -208,6 +208,7 @@ workflows: # branches: # only: # - /^[0-9]+\.[0-9]+$/ + - e2e-tests - build-and-deploy: # requires: # - test From 41762805ff802d5412fea873eb1d88b3bf3c74f7 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:54:05 +0300 Subject: [PATCH 23/28] Remove unnecessary dependencies --- test/e2e/setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/e2e/setup.py b/test/e2e/setup.py index 34eca3f822..029d1eb438 100644 --- a/test/e2e/setup.py +++ b/test/e2e/setup.py @@ -30,8 +30,6 @@ license="Apache License 2.0", python_requires=">=3.6", install_requires=[ - "grpcio==1.36.0", - "grpcio-tools==1.36.0", "requests==2.24.0", "jsonschema==3.2.0", "pytest==6.1.*", From 0e194351f0b5b92990da5d61305acd4142a8e70b Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:54:13 +0300 Subject: [PATCH 24/28] Set progress flag to plain --- build/build-image.sh | 2 +- build/push-image.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/build-image.sh b/build/build-image.sh index 352582e251..7b75d9a9a0 100755 --- a/build/build-image.sh +++ b/build/build-image.sh @@ -27,4 +27,4 @@ platforms=$2 if [ "$image" == "inferentia" ]; then aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin 790709498068.dkr.ecr.us-west-2.amazonaws.com fi -docker buildx build $ROOT -f $ROOT/images/$image/Dockerfile -t quay.io/cortexlabs/${image}:${CORTEX_VERSION} -t cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms +docker buildx build --progress plain $ROOT -f $ROOT/images/$image/Dockerfile -t quay.io/cortexlabs/${image}:${CORTEX_VERSION} -t cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms diff --git a/build/push-image.sh b/build/push-image.sh index 35c6bbc422..51ebffd769 100755 --- a/build/push-image.sh +++ b/build/push-image.sh @@ -26,4 +26,4 @@ image=$2 platforms=$3 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin -docker buildx build $ROOT -f $ROOT/images/$image/Dockerfile $host/cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms --push +docker buildx build --progress plain $ROOT -f $ROOT/images/$image/Dockerfile $host/cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms --push From 472546a4b0e6c19758346489289d6a6eaca3e98d Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 17:55:29 +0300 Subject: [PATCH 25/28] Experiment 21 --- .circleci/config.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b34e4f365f..2c40977afa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -209,16 +209,16 @@ workflows: # only: # - /^[0-9]+\.[0-9]+$/ - e2e-tests - - build-and-deploy: - # requires: - # - test - # - build-and-deploy-approval - filters: - branches: - only: - - master - - fix-circle-ci-builds - - /^[0-9]+\.[0-9]+$/ + # - build-and-deploy: + # # requires: + # # - test + # # - build-and-deploy-approval + # filters: + # branches: + # only: + # - master + # - fix-circle-ci-builds + # - /^[0-9]+\.[0-9]+$/ nightly: triggers: - schedule: From 1925f19e815ebedfdf79edf0726b1a5b4e5ccb43 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 18:00:05 +0300 Subject: [PATCH 26/28] Re-enable build-and-deploy job --- .circleci/config.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c40977afa..afe7725c4c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -208,17 +208,16 @@ workflows: # branches: # only: # - /^[0-9]+\.[0-9]+$/ - - e2e-tests - # - build-and-deploy: + - build-and-deploy: # # requires: # # - test # # - build-and-deploy-approval - # filters: - # branches: - # only: - # - master - # - fix-circle-ci-builds - # - /^[0-9]+\.[0-9]+$/ + filters: + branches: + only: + - master + - fix-circle-ci-builds + - /^[0-9]+\.[0-9]+$/ nightly: triggers: - schedule: From 70cfd341cf1f7ed37a0febd233c671068343c0da Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 18:15:04 +0300 Subject: [PATCH 27/28] Fixes for make ci-push-images --- build/build-image.sh | 2 +- build/push-image.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/build-image.sh b/build/build-image.sh index 7b75d9a9a0..26d1edaddc 100755 --- a/build/build-image.sh +++ b/build/build-image.sh @@ -27,4 +27,4 @@ platforms=$2 if [ "$image" == "inferentia" ]; then aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin 790709498068.dkr.ecr.us-west-2.amazonaws.com fi -docker buildx build --progress plain $ROOT -f $ROOT/images/$image/Dockerfile -t quay.io/cortexlabs/${image}:${CORTEX_VERSION} -t cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms +docker buildx build $ROOT --progress plain -f $ROOT/images/$image/Dockerfile -t quay.io/cortexlabs/${image}:${CORTEX_VERSION} -t cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms diff --git a/build/push-image.sh b/build/push-image.sh index 51ebffd769..1590e29236 100755 --- a/build/push-image.sh +++ b/build/push-image.sh @@ -26,4 +26,4 @@ image=$2 platforms=$3 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin -docker buildx build --progress plain $ROOT -f $ROOT/images/$image/Dockerfile $host/cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms --push +docker buildx build $ROOT --progress plain -f $ROOT/images/$image/Dockerfile -t $host/cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms --push From ad0e88bceeefc766bdff3198069073be4403dca9 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 22 Jun 2021 18:27:06 +0300 Subject: [PATCH 28/28] Revert temporary changes --- .circleci/config.yml | 31 +++++++++++++++-------------- build/images.sh | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index afe7725c4c..3bb11c678d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -128,9 +128,9 @@ jobs: docker context create custom-context --default-stack-orchestrator swarm --docker "host=$DOCKER_HOST,ca=$DOCKER_CERT_PATH/ca.pem,cert=$DOCKER_CERT_PATH/cert.pem,key=$DOCKER_CERT_PATH/key.pem" docker buildx create --name builder --platform linux/amd64,linux/arm64 --use custom-context && docker buildx inspect --bootstrap - run: pip install awscli - # - run: make ci-build-cli - # - return-if-not-deployed-branch - # - run: make ci-build-and-upload-cli + - run: make ci-build-cli + - return-if-not-deployed-branch + - run: make ci-build-and-upload-cli - run: make ci-build-images - quay-login - run: @@ -199,24 +199,23 @@ jobs: workflows: build: jobs: - # - test - # - build-and-deploy-approval: - # type: approval - # requires: - # - test - # filters: - # branches: - # only: - # - /^[0-9]+\.[0-9]+$/ + - test + - build-and-deploy-approval: + type: approval + requires: + - test + filters: + branches: + only: + - /^[0-9]+\.[0-9]+$/ - build-and-deploy: - # # requires: - # # - test - # # - build-and-deploy-approval + requires: + - test + - build-and-deploy-approval filters: branches: only: - master - - fix-circle-ci-builds - /^[0-9]+\.[0-9]+$/ nightly: triggers: diff --git a/build/images.sh b/build/images.sh index 5747a8579b..32a3f1b661 100644 --- a/build/images.sh +++ b/build/images.sh @@ -21,32 +21,32 @@ set -euo pipefail dev_images=( "manager" - # "proxy" - # "async-gateway" - # "enqueuer" - # "dequeuer" + "proxy" + "async-gateway" + "enqueuer" + "dequeuer" ) non_dev_images=( - # "cluster-autoscaler" - # "operator" - # "controller-manager" - # "istio-proxy" - # "istio-pilot" - # "fluent-bit" - # "prometheus" - # "prometheus-config-reloader" - # "prometheus-operator" - # "prometheus-statsd-exporter" - # "prometheus-dcgm-exporter" - # "prometheus-kube-state-metrics" - # "prometheus-node-exporter" - # "kube-rbac-proxy" - # "grafana" - # "event-exporter" - # "metrics-server" - # "inferentia" - # "nvidia" + "cluster-autoscaler" + "operator" + "controller-manager" + "istio-proxy" + "istio-pilot" + "fluent-bit" + "prometheus" + "prometheus-config-reloader" + "prometheus-operator" + "prometheus-statsd-exporter" + "prometheus-dcgm-exporter" + "prometheus-kube-state-metrics" + "prometheus-node-exporter" + "kube-rbac-proxy" + "grafana" + "event-exporter" + "metrics-server" + "inferentia" + "nvidia" "kubexit" )