From a4511e6bae8fa076d0957adc6b06237781c0cf94 Mon Sep 17 00:00:00 2001
From: Jeff Cheng <83052155+jcheng-splunk@users.noreply.github.com>
Date: Thu, 26 Aug 2021 11:16:01 -0400
Subject: [PATCH] Update circleci jobs (#671)

---
 .circleci/config.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23fa102c758..24cdaf01529 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -162,6 +162,8 @@ jobs:
       - persist_to_workspace:
           root: ~/
           paths: project/bin
+      - store_artifacts:
+          path: bin
 
   test:
     executor: golang
@@ -218,10 +220,9 @@ jobs:
           name: Save docker image
           command: |
             mkdir -p dist
-            docker save -o dist/image.tar otelcol:latest
-      - persist_to_workspace:
-          root: ~/
-          paths: project/dist
+            docker save -o dist/otelcol.tar otelcol:latest
+      - store_artifacts:
+          path: dist/otelcol.tar
 
   windows-docker-otelcol:
     executor:
@@ -232,12 +233,14 @@ jobs:
       - run:
           name: Build docker image
           command: |
+            $ErrorActionPreference = 'Stop'
             Copy-Item .\bin\otelcol_windows_amd64.exe .\cmd\otelcol\otelcol.exe
             docker build -t otelcol-windows --build-arg SMART_AGENT_RELEASE=$((Get-Content internal\buildscripts\packaging\smart-agent-release.txt).TrimStart("v")) -f .\cmd\otelcol\Dockerfile.windows .\cmd\otelcol\
             Remove-Item .\cmd\otelcol\otelcol.exe
       - run:
           name: Run docker image
           command: |
+            $ErrorActionPreference = 'Stop'
             docker run -d -e SPLUNK_ACCESS_TOKEN=12345 -e SPLUNK_REALM=fake-realm --name otelcol otelcol-windows:latest
             Start-Sleep 10
             $DockerOutput=$(docker ps --filter=status=running --filter=name=otelcol -q)
@@ -249,13 +252,11 @@ jobs:
       - run:
           name: Save docker image
           command: |
+            $ErrorActionPreference = 'Stop'
             New-Item -ItemType Directory -Force -Path dist
-            docker save -o dist\windows-image.tar otelcol-windows:latest
-      - persist_to_workspace:
-          root: ~/
-          paths: project/dist
+            docker save -o dist\otelcol-windows.tar otelcol-windows:latest
       - store_artifacts:
-          path: dist/windows-image.tar
+          path: dist/otelcol-windows.tar
 
   windows-test:
     executor:
@@ -269,6 +270,7 @@ jobs:
       - run:
           name: Upgrade golang
           command: |
+            $ErrorActionPreference = 'Stop'
             choco upgrade golang --version=1.17
             refreshenv
             go env -w CGO_ENABLED=0
@@ -277,7 +279,9 @@ jobs:
 #            (New-Object System.Net.WebClient).DownloadFile("https://codecov.io/bash", "C:\Users\circleci\project\codecov.sh")
       - run:
           name: Unit tests with coverage
-          command: go-acc ./...
+          command: |
+            $ErrorActionPreference = 'Stop'
+            go-acc ./...
 #      - run:
 #          name: Upload coverage
 #          command: bash codecov.sh -f coverage.txt
@@ -309,9 +313,6 @@ jobs:
               --html=~/testresults/results.html\
               --self-contained-html \
               internal/buildscripts/packaging/tests/package_test.py
-      - persist_to_workspace:
-          root: ~/
-          paths: project/dist/*.<< parameters.package_type >>
       - store_artifacts:
           path: dist
       - save_pytest_results
@@ -380,6 +381,7 @@ jobs:
       - run:
           name: Installation test
           command: |
+            $ErrorActionPreference = 'Stop'
             Set-PSDebug -Trace 1
             $msi_path = Resolve-Path .\dist\splunk-otel-collector*.msi
             $env:VERIFY_ACCESS_TOKEN = "false"