Test Docker Push

open-o11y · Dec 16, 2020 · 28b450e · 28b450e
1 parent fe4c8b7
commit 28b450e
Showing 1 changed file with 8 additions and 31 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -32,7 +32,7 @@ jobs:
           key: go-pkg-mod-${{ runner.os }}-${{ hashFiles('./go.mod') }}
       - name: Run Unit tests
         run: go test ./...
-      - name: GitHub issue generator
+      - name: GitHub Issue Generator
         if: ${{ failure() && github.ref == 'ref/head/master' }}
         run: |
           go run cmd/issuegenerator/main.go $TEST_RESULTS
@@ -92,7 +92,6 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: tool-binaries
-          path: /home/runner/go/bin
       - name: Extract Tool Binaries Archive
         run: tar -xvf tool-bin.tar -C /
       - name: Lint
@@ -126,7 +125,6 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: tool-binaries
-          path: /home/runner/go/bin
       - name: Extract Tool Binaries Archive
         run: tar -xvf tool-bin.tar -C /
       - name: Build Collector for All Architectures
@@ -209,7 +207,6 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: tool-binaries
-          path: /home/runner/go/bin
       - name: Extract Tool Binaries Archive
         run: tar -xvf tool-bin.tar -C /
       - name: Install fluentbit
@@ -264,7 +261,6 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: tool-binaries
-          path: /home/runner/go/bin
       - name: Extract Tool Binaries Archive
         run: tar -xvf tool-bin.tar -C /
       - name: Loadtest
@@ -281,6 +277,8 @@ jobs:
       matrix:
         package_type: ["deb", "rpm"]
     steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
       - name: Setup Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
@@ -408,40 +406,19 @@ jobs:
         run: chmod -R +x ./dist
       - name: Verify Distribution Files Exist
         id: check
-        run: |
-          files=(
-              'bin/otelcol_darwin_amd64'
-              'bin/otelcol_linux_arm64'
-              'bin/otelcol_linux_amd64'
-              'bin/otelcol_windows_amd64.exe'
-              'dist/otel-collector-*arm64.rpm'
-              'dist/otel-collector_*amd64.deb'
-              'dist/otel-collector-*x86_64.rpm'
-              'dist/otel-collector_*arm64.deb'
-              'dist/otel-collector-*amd64.msi'
-          );
-          for f in "${files[@]}"
-          do
-              if [[ ! -f $f ]]
-              then
-                  echo "$f does not exist."
-                  echo "::set-output name=passed::false"
-                  exit 0 
-              fi
-          done
-          echo "::set-output name=passed::true"
+        run: ./.github/workflows/scripts/verify-dist-files-exist.sh
       - name: Build Docker Image
         if: ${{ steps.check.outputs.passed }}
         run: |
             make docker-otelcol
-            docker tag otelcol:latest otel/opentelemetry-collector-dev:$GITHUB_SHA
-            docker tag otelcol:latest otel/opentelemetry-collector-dev:latest
+            docker tag otelcol:latest shovnik/deploy-test:$GITHUB_SHA
+            docker tag otelcol:latest shovnik/deploy-test:latest
       - name: Push Docker Image
         if: ${{ steps.check.outputs.passed }}
         run: |
             docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-            docker push otel/opentelemetry-collector-dev:$GITHUB_SHA
-            docker push otel/opentelemetry-collector-dev:latest
+            docker push shovnik/deploy-test:$GITHUB_SHA
+            docker push shovnik/deploy-test:latest
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME}}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD}}