Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Go modules #15853

Merged
merged 33 commits into from
Mar 3, 2020
Merged

Go modules #15853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
99c8add
add initiail go.mod file
kvch Jan 27, 2020
e8a294f
Initialize go.mod from vendor (#15688)
kvch Jan 31, 2020
4889d07
update go-ucfg v0.8.1
kvch Feb 3, 2020
63e58d6
Install tools (mage, goimports, etc.) from vendor folder (#15998)
kvch Feb 6, 2020
9f73c3e
Add dependencies with v2 or bigger major versions (#16100)
kvch Feb 7, 2020
d786c05
Various fixes: use fork of go-plugins-helpers, Functionbeat, template…
kvch Feb 10, 2020
3fcf734
Add C dependencies to vendor (#16127)
kvch Feb 11, 2020
2551423
Adjust CI configuration (#16216)
kvch Feb 12, 2020
7475985
Add GOFLAGS to missing system-test-env (#16236)
kvch Feb 12, 2020
f7b5835
Update go-modules with master (#16274)
kvch Feb 12, 2020
83d8bce
Make Beats buildable outside GOPATH (#16329)
kvch Feb 20, 2020
3f88aec
Add major version to root import path (#16331)
kvch Feb 20, 2020
02ba774
Merge master into go-modules (#16453)
kvch Feb 21, 2020
7688378
dev-tools/mage: never prefix build vars (#16446)
axw Feb 24, 2020
8e7f9a1
dev-tools/mage: use "go list -m" to locate beats (#16445)
axw Feb 24, 2020
2ef8995
Various minor fixes to go-modules (#16481)
kvch Feb 24, 2020
325f4b7
Fix path to mage in Docker env (#16519)
kvch Feb 24, 2020
ca3f8f6
Add more tool dependencies:gox, reviewdog (#16545)
kvch Feb 25, 2020
8d4d96e
Follow-up breaking change in Winlogbeat (#16551)
kvch Feb 25, 2020
baf2056
Make usage of vendor folder optional (#16548)
kvch Feb 26, 2020
72e1d29
Remove all scripts used to maintain vendor folder (#16599)
kvch Feb 26, 2020
2fd392f
Disable generators temporarily (#16602)
kvch Feb 26, 2020
4e50e09
More fixes after rebase to upstream/master
kvch Feb 26, 2020
075ec15
Do not downgrade go-ucfg to 0.8.2
kvch Feb 26, 2020
3c16e1d
Add minor fixes
kvch Feb 27, 2020
7442948
Use out fork of insomniacslk/dhcp to make Packetbeat work on Windows
kvch Feb 27, 2020
ad761c5
Use packetbeat branch of github.com/elastic/dhcp
kvch Feb 28, 2020
6e573bd
Disable checks for generators on Jenkins
kvch Feb 28, 2020
77a61ae
Follow-up after rebasing on top of master i.
kvch Feb 28, 2020
1c98e7c
Make sure no dependency is added accidentally
kvch Feb 28, 2020
4e63927
Import fixes after rebase
kvch Mar 2, 2020
a09f149
Clean up changelog
kvch Mar 2, 2020
8ab305e
Fixes after rebase
kvch Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
33 changes: 17 additions & 16 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,23 +148,24 @@ jobs:
stage: test

# Generators
- os: linux
env: TARGETS="-C generator/metricbeat test test-package"
go: $TRAVIS_GO_VERSION
stage: test
- os: linux
env: TARGETS="-C generator/beat test test-package"
go: $TRAVIS_GO_VERSION
stage: test
# Temporarily disable generator jobs
#- os: linux
# env: TARGETS="-C generator/_templates/metricbeat test test-package"
# go: $TRAVIS_GO_VERSION
# stage: test
#- os: linux
# env: TARGETS="-C generator/_templates/beat test test-package"
# go: $TRAVIS_GO_VERSION
# stage: test

- os: osx
env: TARGETS="-C generator/metricbeat test"
go: $TRAVIS_GO_VERSION
stage: test
- os: osx
env: TARGETS="-C generator/beat test"
go: $TRAVIS_GO_VERSION
stage: test
#- os: osx
# env: TARGETS="-C generator/_templates/metricbeat test"
# go: $TRAVIS_GO_VERSION
# stage: test
#- os: osx
# env: TARGETS="-C generator/_templates/beat test"
# go: $TRAVIS_GO_VERSION
# stage: test

# Kubernetes
- os: linux
Expand Down
92 changes: 53 additions & 39 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,19 @@ pipeline {
makeTarget("Auditbeat x-pack Linux", "-C x-pack/auditbeat testsuite")
}
}
stage('Auditbeat x-pack'){
agent { label 'ubuntu && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
expression {
return env.BUILD_AUDITBEAT_XPACK != "false"
}
}
steps {
makeTarget("Auditbeat x-pack Linux", "-C x-pack/auditbeat testsuite")
}
}
stage('Libbeat'){
agent { label 'ubuntu && immutable' }
options { skipDefaultCheckout() }
Expand Down Expand Up @@ -459,44 +472,45 @@ pipeline {
}
}
}
stage('Generators'){
agent { label 'ubuntu && immutable' }
options { skipDefaultCheckout() }
when {
beforeAgent true
expression {
return env.BUILD_GENERATOR != "false"
}
}
stages {
stage('Generators Metricbeat Linux'){
steps {
makeTarget("Generators Metricbeat Linux", "-C generator/metricbeat test")
makeTarget("Generators Metricbeat Linux", "-C generator/metricbeat test-package")
}
}
stage('Generators Beat Linux'){
steps {
makeTarget("Generators Beat Linux", "-C generator/beat test")
makeTarget("Generators Beat Linux", "-C generator/beat test-package")
}
}
stage('Generators Metricbeat Mac OS X'){
agent { label 'macosx' }
options { skipDefaultCheckout() }
steps {
makeTarget("Generators Metricbeat Mac OS X", "-C generator/metricbeat test")
}
}
stage('Generators Beat Mac OS X'){
agent { label 'macosx' }
options { skipDefaultCheckout() }
steps {
makeTarget("Generators Beat Mac OS X", "-C generator/beat test")
}
}
}
}
// Temporarily disable generator jobs
//stage('Generators'){
// agent { label 'ubuntu && immutable' }
// options { skipDefaultCheckout() }
// when {
// beforeAgent true
// expression {
// return env.BUILD_GENERATOR != "false"
// }
// }
// stages {
// stage('Generators Metricbeat Linux'){
// steps {
// makeTarget("Generators Metricbeat Linux", "-C generator/_templates/metricbeat test")
// makeTarget("Generators Metricbeat Linux", "-C generator/_templates/metricbeat test-package")
// }
// }
// stage('Generators Beat Linux'){
// steps {
// makeTarget("Generators Beat Linux", "-C generator/_templates/beat test")
// makeTarget("Generators Beat Linux", "-C generator/_templates/beat test-package")
// }
// }
// stage('Generators Metricbeat Mac OS X'){
// agent { label 'macosx' }
// options { skipDefaultCheckout() }
// steps {
// makeTarget("Generators Metricbeat Mac OS X", "-C generator/_templates/metricbeat test")
// }
// }
// stage('Generators Beat Mac OS X'){
// agent { label 'macosx' }
// options { skipDefaultCheckout() }
// steps {
// makeTarget("Generators Beat Mac OS X", "-C generator/_templates/beat test")
// }
// }
// }
//}
stage('Kubernetes'){
agent { label 'ubuntu && immutable' }
options { skipDefaultCheckout() }
Expand Down Expand Up @@ -672,7 +686,7 @@ def loadConfigEnvVars(){
"^x-pack/functionbeat/.*",
"^x-pack/libbeat/.*",
])
env.BUILD_GENERATOR = isChanged(["^generator/.*"])
//env.BUILD_GENERATOR = isChanged(["^generator/.*"])
env.BUILD_HEARTBEAT = isChanged(["^heartbeat/.*"])
env.BUILD_HEARTBEAT_XPACK = isChanged([
"^heartbeat/.*",
Expand Down
7 changes: 1 addition & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,6 @@ clean: mage
@$(MAKE) -C generator clean
@-mage -clean

# Cleans up the vendor directory from unnecessary files
# This should always be run after updating the dependencies
.PHONY: clean-vendor
clean-vendor:
@sh script/clean_vendor.sh

.PHONY: check
check: python-env
@$(foreach var,$(PROJECTS) dev-tools $(PROJECTS_XPACK_MAGE),$(MAKE) -C $(var) check || exit 1;)
Expand All @@ -95,6 +89,7 @@ check: python-env
@# Validate that all updates were committed
@$(MAKE) update
@$(MAKE) check-headers
go mod tidy
@git diff | cat
@git update-index --refresh
@git diff-index --exit-code HEAD --
Expand Down
Loading