remove more stuff

Dynatrace · Feb 3, 2025 · c2376e6 · c2376e6
1 parent 4a8cbad
commit c2376e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/.ci/nightly.groovy b/.ci/nightly.groovy
@@ -19,11 +19,6 @@ pipeline {
             }
         }
 
-        stage("🧓 Integration test (legacy)") {
-            steps {
-                executeWithSecrets(cmd: 'make integration-test-v1')
-            }
-        }
 
         stage("📥/📤 Download/Restore test") {
             steps {

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ BINARY_NAME ?= monaco
 VERSION ?= 2.x
 RELEASES = $(BINARY_NAME)-windows-amd64.exe $(BINARY_NAME)-windows-386.exe $(BINARY_NAME)-linux-arm64 $(BINARY_NAME)-linux-amd64 $(BINARY_NAME)-linux-386 $(BINARY_NAME)-darwin-amd64 $(BINARY_NAME)-darwin-arm64
 
-.PHONY: lint format mocks build install clean test integration-test integration-test-v1 test-package default add-license-headers compile build-release $(RELEASES) docker-container sign-image install-ko
+.PHONY: lint format mocks build install clean test integration-test test-package default add-license-headers compile build-release $(RELEASES) docker-container sign-image install-ko
 
 default: build
 
@@ -95,9 +95,6 @@ test: mocks install-gotestsum
 integration-test: mocks install-gotestsum
 	@gotestsum ${testopts} --format testdox -- -tags=integration -timeout=30m -v -race ./cmd/monaco/integrationtest/v2
 
-integration-test-v1: mocks install-gotestsum
-	@gotestsum ${testopts} --format testdox -- -tags=integration_v1 -timeout=30m -v -race ./cmd/monaco/integrationtest/v1
-
 download-restore-test: mocks install-gotestsum
 	@gotestsum ${testopts} --format testdox -- -tags=download_restore -timeout=30m -v -race ./...
 

diff --git a/internal/log/log_test.go b/internal/log/log_test.go
@@ -22,14 +22,16 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"os"
+	"testing"
+
+	"github.com/spf13/afero"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/dynatrace/dynatrace-configuration-as-code/v2/internal/log/field"
 	"github.com/dynatrace/dynatrace-configuration-as-code/v2/internal/loggers"
 	"github.com/dynatrace/dynatrace-configuration-as-code/v2/internal/testutils"
 	"github.com/dynatrace/dynatrace-configuration-as-code/v2/pkg/config/coordinate"
-	"github.com/spf13/afero"
-	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 func TestPrepareLogging(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,11 +19,6 @@ pipeline { @@
                 }
             }
-            stage("🧓 Integration test (legacy)") {
-                steps {
-                    executeWithSecrets(cmd: 'make integration-test-v1')
-                }
-            }
             stage("📥/📤 Download/Restore test") {
                 steps {
@@ Expand Down @@