From 430106d09e28ab3719a2967755a129378b710184 Mon Sep 17 00:00:00 2001
From: Alexander Yastrebov <alexander.yastrebov@zalando.de>
Date: Thu, 31 Aug 2023 16:37:58 +0200
Subject: [PATCH] build: remove cicheck (#2553)

Make cicheck is equvalent to shortcheck due to wrong redis build tag
use, see #1854

This change removes redis build tag, build comments and replaces cicheck
with the shortcheck target.

Fixes #1854

Signed-off-by: Alexander Yastrebov <alexander.yastrebov@zalando.de>
---
 .github/workflows/master.yaml           | 2 --
 .github/workflows/pr.yaml               | 2 +-
 Makefile                                | 4 ----
 circuit/registry_test.go                | 2 --
 dataclients/routestring/example_test.go | 3 ---
 delivery.yaml                           | 2 +-
 etcd/etcdtime_test.go                   | 3 ---
 metrics/codahalenorace_test.go          | 2 --
 plugins_test.go                         | 3 ---
 proxy/backendratelimit_test.go          | 3 ---
 proxy/breaker_test.go                   | 3 ---
 ratelimit/cluster_test.go               | 3 ---
 ratelimit/swim_test.go                  | 3 ---
 13 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index d5e2975814..c9926fbf72 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -20,11 +20,9 @@ jobs:
       - run: go version
       - run: make deps
       - run: make check-fmt
-      - run: make build
       - run: make vet
       - run: make staticcheck
       - run: make check-race
-      - run: make cicheck
       - run: make osv-scanner
       - run: make gosec
       - run: make govulncheck
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 306547be40..e67afe1243 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -40,4 +40,4 @@ jobs:
       - run: make check-fmt
       - run: make vet
       - run: make staticcheck
-      - run: make cicheck
+      - run: make shortcheck
diff --git a/Makefile b/Makefile
index e99a2fbd27..15e65b880b 100644
--- a/Makefile
+++ b/Makefile
@@ -81,10 +81,6 @@ check: build check-plugins ## run all tests
 shortcheck: build check-plugins fixlimits  ## run all short tests
 	go test -test.short ./...
 
-.PHONY: cicheck
-cicheck: build check-plugins ## run all short and redis tests
-	go test -tags=redis -test.short ./...
-
 .PHONY: check-race
 check-race: build ## run all short tests with race checker
 	go test -race -test.short ./...
diff --git a/circuit/registry_test.go b/circuit/registry_test.go
index 1fdb1e0e03..a376e12946 100644
--- a/circuit/registry_test.go
+++ b/circuit/registry_test.go
@@ -1,5 +1,3 @@
-/* +build !race */
-
 package circuit
 
 import (
diff --git a/dataclients/routestring/example_test.go b/dataclients/routestring/example_test.go
index 3d2098d084..4f15c9d7ac 100644
--- a/dataclients/routestring/example_test.go
+++ b/dataclients/routestring/example_test.go
@@ -1,6 +1,3 @@
-//go:build !race
-// +build !race
-
 package routestring_test
 
 import (
diff --git a/delivery.yaml b/delivery.yaml
index fb2a43f9a5..72109e584a 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -50,7 +50,7 @@ pipeline:
       fi
       export IMAGE MULTIARCH_IMAGE
 
-      make deps cicheck staticcheck gosec
+      make deps check-fmt vet staticcheck gosec shortcheck
 
       if [[ $CDP_TARGET_BRANCH == master && ! $CDP_PULL_REQUEST_NUMBER ]]; then
         echo "Creating git tag: ${RELEASE_VERSION}"
diff --git a/etcd/etcdtime_test.go b/etcd/etcdtime_test.go
index 581b02edec..c654a08223 100644
--- a/etcd/etcdtime_test.go
+++ b/etcd/etcdtime_test.go
@@ -1,6 +1,3 @@
-//go:build !race
-// +build !race
-
 package etcd
 
 import (
diff --git a/metrics/codahalenorace_test.go b/metrics/codahalenorace_test.go
index a1cc2ea8f5..4959cdbf92 100644
--- a/metrics/codahalenorace_test.go
+++ b/metrics/codahalenorace_test.go
@@ -1,5 +1,3 @@
-/* +build !race */
-
 package metrics
 
 import (
diff --git a/plugins_test.go b/plugins_test.go
index ccd5fcfad8..77f7d82dc3 100644
--- a/plugins_test.go
+++ b/plugins_test.go
@@ -1,6 +1,3 @@
-//go:build !race
-// +build !race
-
 package skipper
 
 import "testing"
diff --git a/proxy/backendratelimit_test.go b/proxy/backendratelimit_test.go
index 1d00b7a169..bff6f25c87 100644
--- a/proxy/backendratelimit_test.go
+++ b/proxy/backendratelimit_test.go
@@ -1,6 +1,3 @@
-//go:build !race || redis
-// +build !race redis
-
 package proxy_test
 
 import (
diff --git a/proxy/breaker_test.go b/proxy/breaker_test.go
index f403b15bef..75c2427da8 100644
--- a/proxy/breaker_test.go
+++ b/proxy/breaker_test.go
@@ -1,6 +1,3 @@
-//go:build !race
-// +build !race
-
 package proxy_test
 
 import (
diff --git a/ratelimit/cluster_test.go b/ratelimit/cluster_test.go
index 45c623c663..5a0ba08391 100644
--- a/ratelimit/cluster_test.go
+++ b/ratelimit/cluster_test.go
@@ -1,6 +1,3 @@
-//go:build !race || redis
-// +build !race redis
-
 package ratelimit
 
 import (
diff --git a/ratelimit/swim_test.go b/ratelimit/swim_test.go
index 4965738224..e229fac000 100644
--- a/ratelimit/swim_test.go
+++ b/ratelimit/swim_test.go
@@ -1,6 +1,3 @@
-//go:build !race
-// +build !race
-
 package ratelimit
 
 import (