Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

Commit ad12d93

Browse files
adam-stokesmergify-bot
adam-stokes
authored and
mergify-bot
committed
Fix conflicts
Signed-off-by: Adam Stokes <51892+adam-stokes@users.noreply.github.com>
1 parent 5a301f9 commit ad12d93

12 files changed

Lines changed: 3 additions & 75 deletions

‎Makefile‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<<<<<<< HEAD
2-
=======
31
# Get current directory of a Makefile: https://stackoverflow.com/a/23324703
42

53
include ./commons.mk
@@ -9,7 +7,6 @@ include ./commons.mk
97
build:
108
goreleaser --snapshot --skip-publish --rm-dist
119

12-
>>>>>>> 249fd97a... fix: run unit tests after refactor (#1067)
1310
.PHONY: clean
1411
clean: clean-workspace clean-docker
1512

@@ -24,8 +21,6 @@ clean-workspace:
2421
.PHONY: install
2522
install:
2623
go get -v -t ./...
27-
<<<<<<< HEAD
28-
=======
2924

3025
.PHONY: notice
3126
notice:
@@ -48,4 +43,3 @@ unit-test: test-report-setup unit-test-dir-cli unit-test-dir-internal unit-test-
4843
.PHONY: unit-test-suite-%
4944
unit-test-dir-%:
5045
cd $* && gotestsum --junitfile "$(PWD)/outputs/TEST-unit-$*.xml" --format testname -- -count=1 -timeout=$(TEST_TIMEOUT) ./...
51-
>>>>>>> 249fd97a... fix: run unit tests after refactor (#1067)

‎e2e/Makefile‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -87,35 +87,6 @@ functional-test: install-godog
8787
lint:
8888
@docker run -t --rm -v $(PWD):/src -w /src gherkin/lint **/*.feature --disable AvoidOutlineForSingleExample,TooClumsy,TooManySteps,TooManyDifferentTags,TooLongStep
8989

90-
<<<<<<< HEAD
91-
.PHONY: notice
92-
notice:
93-
@echo "Generating NOTICE"
94-
go mod tidy
95-
go mod download
96-
go list -m -json all | go run go.elastic.co/go-licence-detector \
97-
-includeIndirect \
98-
-rules ../notice/rules.json \
99-
-overrides ../notice/overrides.json \
100-
-noticeTemplate ../notice/NOTICE.txt.tmpl \
101-
-noticeOut NOTICE.txt \
102-
-depsOut ""
103-
104-
.PHONY: unit-test
105-
unit-test: test-report-setup unit-test-e2e unit-test-suite-fleet unit-test-suite-helm unit-test-suite-metricbeat
106-
107-
# See https://pkg.go.dev/gotest.tools/gotestsum/#readme-junit-xml-output
108-
.PHONY: unit-test-e2e
109-
unit-test-e2e:
110-
gotestsum --junitfile "$(PWD)/outputs/TEST-unit-e2e.xml" --format testname -- -count=1 -timeout=$(TEST_TIMEOUT) ./...
111-
112-
# See https://pkg.go.dev/gotest.tools/gotestsum/#readme-junit-xml-output
113-
.PHONY: unit-test-suite-%
114-
unit-test-suite-%:
115-
cd _suites/$* && gotestsum --junitfile "$(PWD)/outputs/TEST-unit-e2e-$*.xml" --format testname -- -count=1 -timeout=$(TEST_TIMEOUT) ./...
116-
117-
=======
118-
>>>>>>> 249fd97a... fix: run unit tests after refactor (#1067)
11990
## Test examples
12091

12192
.PHONY: fleet-fleet

‎e2e/_suites/fleet/configurations/kibana.config.yml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎e2e/_suites/fleet/stand-alone.go‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package main
77
import (
88
"context"
99
"fmt"
10-
"os"
1110
"strings"
1211
"time"
1312

@@ -27,10 +26,9 @@ import (
2726

2827
// StandAloneTestSuite represents the scenarios for Stand-alone-mode
2928
type StandAloneTestSuite struct {
30-
AgentConfigFilePath string
31-
Cleanup bool
32-
Hostname string
33-
Image string
29+
Cleanup bool
30+
Hostname string
31+
Image string
3432
// date controls for queries
3533
AgentStoppedDate time.Time
3634
RuntimeDependenciesStartDate time.Time
@@ -52,21 +50,6 @@ func (sats *StandAloneTestSuite) afterScenario() {
5250
} else {
5351
log.WithField("service", serviceName).Info("Because we are running in development mode, the service won't be stopped")
5452
}
55-
56-
if _, err := os.Stat(sats.AgentConfigFilePath); err == nil {
57-
beatsLocalPath := shell.GetEnv("BEATS_LOCAL_PATH", "")
58-
if beatsLocalPath == "" {
59-
os.Remove(sats.AgentConfigFilePath)
60-
61-
log.WithFields(log.Fields{
62-
"path": sats.AgentConfigFilePath,
63-
}).Trace("Elastic Agent configuration file removed.")
64-
} else {
65-
log.WithFields(log.Fields{
66-
"path": sats.AgentConfigFilePath,
67-
}).Trace("Elastic Agent configuration file not removed because it's part of a repository.")
68-
}
69-
}
7053
}
7154

7255
func (sats *StandAloneTestSuite) contributeSteps(s *godog.ScenarioContext) {

cli/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-8.0.0-SNAPSHOT-amd64.deb renamed to internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-8.0.0-SNAPSHOT-amd64.deb

File renamed without changes.

cli/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-8.0.0-SNAPSHOT-linux-amd64.docker.tar.gz renamed to internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-8.0.0-SNAPSHOT-linux-amd64.docker.tar.gz

File renamed without changes.

cli/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-8.0.0-SNAPSHOT-linux-amd64.tar.gz renamed to internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-8.0.0-SNAPSHOT-linux-amd64.tar.gz

File renamed without changes.

cli/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-8.0.0-SNAPSHOT-x86_64.rpm renamed to internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-8.0.0-SNAPSHOT-x86_64.rpm

File renamed without changes.

cli/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-ubi8-8.0.0-SNAPSHOT-linux-amd64.docker.tar.gz renamed to internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-ubi8-8.0.0-SNAPSHOT-linux-amd64.docker.tar.gz

File renamed without changes.

cli/_testresources/gcp/commits.json renamed to internal/_testresources/gcp/commits.json

File renamed without changes.

0 commit comments

Comments
 (0)