ci: minor updates in pipeline (#93)

Author: brushknight

.github/workflows/push_pr.yml

@@ -1,4 +1,4 @@
-name: Push/PR pipelien
+name: Push/PR pipeline
 
 on:
   push:
@@ -24,6 +24,14 @@ jobs:
       - name: Validate code
         run: make ci/validate
 
+  snyk:
+    name: Run security checks via snyk
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Scan code for vulnerabilities
+        run: make ci/snyk-test
+
   test-nix:
     name: Run unit tests on *Nix
     runs-on: ubuntu-20.04
@@ -48,7 +56,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version:  ${{env.GO_VERSION}}
+          go-version: ${{env.GO_VERSION}}
       - name: Running unit tests
         shell: pwsh
         run: |
@@ -73,22 +81,13 @@ jobs:
           go-version: ${{env.GO_VERSION}}
       - name: Integration test
         env:
-          GOPATH: "${{ github.workspace }}"
+          GOPATH: ${{ github.workspace }}
         run: make integration-test
 
-  build:
-    name: Build binary for all platforms:arch
+  test-build:
+    name: Test binary compilation for all platforms:arch
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Build all platforms:arch
         run: make ci/build
-
-  snyk:
-    name: Run security checks via snyk
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Scan code for vulnerabilities
-        run: make ci/snyk-test
-

build/.goreleaser.yml

@@ -1,5 +1,5 @@
 builds:
-  - id: nri-redis-nix
+  - id: nri-nix
     main: ./src
     binary: nri-redis
     gobinary: "go1.9.7"
@@ -17,7 +17,7 @@ builds:
       - goos: darwin
         goarch: 386
 
-  - id: nri-redis-win
+  - id: nri-win
     main: ./src
     binary: nri-redis
     gobinary: "go1.9.7"
@@ -32,9 +32,9 @@ builds:
       pre: build/windows/set_exe_properties.sh {{ .Env.TAG }} "redis"
 
 nfpms:
-  - id: nri-redis-deb
+  - id: nri-deb
     builds:
-      - nri-redis-nix
+      - nri-nix
     file_name_template: "{{ .ProjectName }}_{{ .Version }}-1_{{ .Arch }}"
     vendor: "New Relic, Inc."
     homepage: "https://www.newrelic.com/infrastructure"
@@ -55,9 +55,9 @@ nfpms:
     dependencies:
       - "newrelic-infra"
 
-  - id: nri-redis-rpm
+  - id: nri-rpm
     builds:
-      - nri-redis-nix
+      - nri-nix
     file_name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Arch }}"
     vendor: "New Relic, Inc."
     homepage: "https://www.newrelic.com/infrastructure"
@@ -83,18 +83,18 @@ nfpms:
           amd64: 1.x86_64
 
 archives:
-  - id: nri-redis-nix
+  - id: nri-nix
     builds:
-      - nri-redis-nix
+      - nri-nix
     name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Version }}_{{ .Arch }}_dirty"
     files:
       - redis-config.yml.sample
       - redis-definition.yml
     format: tar.gz
 
-  - id: nri-redis-win
+  - id: nri-win
     builds:
-      - nri-redis-win
+      - nri-win
     name_template: "{{ .ProjectName }}-{{ .Arch }}.{{ .Version }}_dirty"
     files:
       - redis-win-config.yml.sample

build/ci.mk

@@ -7,6 +7,7 @@ ci/deps:
 .PHONY : ci/debug-container
 ci/debug-container: ci/deps
 	@docker run --rm -it \
+			--name "nri-$(INTEGRATION)-debug" \
 			-v $(CURDIR):/go/src/github.com/newrelic/nri-$(INTEGRATION) \
 			-w /go/src/github.com/newrelic/nri-$(INTEGRATION) \
 			-e PRERELEASE=true \
@@ -21,13 +22,15 @@ ci/debug-container: ci/deps
 .PHONY : ci/validate
 ci/validate: ci/deps
 	@docker run --rm -t \
+			--name "nri-$(INTEGRATION)-validate" \
 			-v $(CURDIR):/go/src/github.com/newrelic/nri-$(INTEGRATION) \
 			-w /go/src/github.com/newrelic/nri-$(INTEGRATION) \
 			$(BUILDER_TAG) make validate
 
 .PHONY : ci/test
 ci/test: ci/deps
 	@docker run --rm -t \
+			--name "nri-$(INTEGRATION)-test" \
 			-v $(CURDIR):/go/src/github.com/newrelic/nri-$(INTEGRATION) \
 			-w /go/src/github.com/newrelic/nri-$(INTEGRATION) \
 			$(BUILDER_TAG) make test
@@ -45,6 +48,7 @@ ci/snyk-test:
 ci/build: ci/deps
 ifdef TAG
 	@docker run --rm -t \
+			--name "nri-$(INTEGRATION)-build" \
 			-v $(CURDIR):/go/src/github.com/newrelic/nri-$(INTEGRATION) \
 			-w /go/src/github.com/newrelic/nri-$(INTEGRATION) \
 			-e INTEGRATION \
@@ -59,6 +63,7 @@ endif
 ci/prerelease: ci/deps
 ifdef TAG
 	@docker run --rm -t \
+			--name "nri-$(INTEGRATION)-prerelease" \
 			-v $(CURDIR):/go/src/github.com/newrelic/nri-$(INTEGRATION) \
 			-w /go/src/github.com/newrelic/nri-$(INTEGRATION) \
 			-e INTEGRATION \