Merge pull request #2751 from weaveworks/upgrade-circle-machine

Upgrade to recent ubuntu image on circleci

.circleci/config.yml

@@ -1,6 +1,7 @@
 version: 2
 defaults: &defaults
   machine:
+    image: ubuntu-2004:202201-02
     docker_layer_caching: true
   working_directory: /home/circleci/src/github.com/weaveworks/service
   environment:
@@ -62,13 +63,7 @@ jobs:
     <<: *defaults
     steps:
       - checkout
-      - run: go get github.com/mattn/goveralls
-      - run: COVERDIR=./coverage make RM= test
-      - run: ./tools/cover/gather_coverage.sh ./coverage $CIRCLE_WORKING_DIRECTORY/coverage
-      - run: ~/bin/goveralls -repotoken $COVERALLS_REPO_TOKEN -coverprofile=$CIRCLE_WORKING_DIRECTORY/profile.cov -service=circleci || true
-      - run: mkdir /tmp/coverage && cp coverage.* /tmp/coverage
-      - store_artifacts:
-          path: /tmp/coverage
+      - run: make RM= test
 
   integration-test:
     <<: *defaults
@@ -119,7 +114,7 @@ jobs:
             echo Last successful build was commit $LAST_BUILD_COMMIT
             mkdir ~/.aws
             echo $AWS_ECR_CREDENTIALS | base64 -d > ~/.aws/credentials
-            $(aws ecr get-login --no-include-email --region us-east-1)
+            aws ecr get-login-password  --region us-east-1 | docker login -u AWS --password-stdin 664268111851.dkr.ecr.us-east-1.amazonaws.com
             IMAGE_REPOSITORY=664268111851.dkr.ecr.us-east-1.amazonaws.com ./push-images --if-changed-since $LAST_BUILD_COMMIT
 
   dry-run-upload:
@@ -137,7 +132,7 @@ jobs:
             echo Last successful build was commit $LAST_BUILD_COMMIT
             mkdir ~/.aws
             echo $AWS_ECR_CREDENTIALS | base64 -d > ~/.aws/credentials
-            $(aws ecr get-login --no-include-email --region us-east-1)
+            aws ecr get-login-password  --region us-east-1 | docker login -u AWS --password-stdin 664268111851.dkr.ecr.us-east-1.amazonaws.com
             IMAGE_REPOSITORY=664268111851.dkr.ecr.us-east-1.amazonaws.com ./push-images --dry-run --if-changed-since $LAST_BUILD_COMMIT
 
 workflows:

tools/test

@@ -69,14 +69,6 @@ fi
 if [ -n "$SLOW" ]; then
     GO_TEST_ARGS=("${GO_TEST_ARGS[@]}" ${RACE})
 
-    # shellcheck disable=SC2153
-    if [ -n "$COVERDIR" ]; then
-        coverdir="$COVERDIR"
-    else
-        coverdir=$(mktemp -d coverage.XXXXXXXXXX)
-    fi
-
-    mkdir -p "$coverdir"
 fi
 
 fail=0
@@ -107,16 +99,6 @@ run_test() {
     fi
 
     local GO_TEST_ARGS_RUN=("${GO_TEST_ARGS[@]}")
-    if [ -n "$SLOW" ]; then
-        local COVERPKGS
-        COVERPKGS=$( (
-            go list "$dir"
-            go list -f '{{join .Deps "\n"}}' "$dir" | grep -v "vendor" | grep "^$PACKAGE_BASE/"
-        ) | paste -s -d, -)
-        local output
-        output=$(mktemp "$coverdir/unit.XXXXXXXXXX")
-        local GO_TEST_ARGS_RUN=("${GO_TEST_ARGS[@]}" "-coverprofile=$output" "-coverpkg=$COVERPKGS")
-    fi
 
     local START
     START=$(date +%s)
@@ -145,12 +127,4 @@ if [ -n "$PARALLEL" ]; then
     wait
 fi
 
-if [ -n "$SLOW" ] && [ -z "$COVERDIR" ]; then
-    go get github.com/weaveworks/tools/cover
-    cover "$coverdir"/* >profile.cov
-    rm -rf "$coverdir"
-    go tool cover -html=profile.cov -o=coverage.html
-    go tool cover -func=profile.cov | tail -n1
-fi
-
 exit $fail