Skip to content

Commit

Permalink
Adjust CI configuration (#16216)
Browse files Browse the repository at this point in the history
## What does this PR do?

This PR adjust the path of the generators as these have been moved.

## Why is it important?

It has to be adjusted, otherwise the CI jobs cannot start.
  • Loading branch information
kvch committed Mar 3, 2020
1 parent 3fcf734 commit 2551423
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,20 +149,20 @@ jobs:

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

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

Expand Down
12 changes: 6 additions & 6 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -471,28 +471,28 @@ pipeline {
stages {
stage('Generators Metricbeat Linux'){
steps {
makeTarget("Generators Metricbeat Linux", "-C generator/metricbeat test")
makeTarget("Generators Metricbeat Linux", "-C generator/metricbeat test-package")
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/beat test")
makeTarget("Generators Beat Linux", "-C generator/beat test-package")
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/metricbeat test")
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/beat test")
makeTarget("Generators Beat Mac OS X", "-C generator/_templates/beat test")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/jenkins_ci.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ $env:TEST_COVERAGE = "true"
$env:RACE_DETECTOR = "true"

# Install mage from vendor.
exec { go install github.com/elastic/beats/vendor/github.com/magefile/mage } "mage install FAILURE"
exec { go install -mod=vendor github.com/magefile/mage } "mage install FAILURE"

if (Test-Path "$env:beat\magefile.go") {
cd "$env:beat"
Expand Down
2 changes: 1 addition & 1 deletion generator/_templates/beat/Makefile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ../common/Makefile
include ../../common/Makefile
2 changes: 1 addition & 1 deletion generator/_templates/metricbeat/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BEAT_TYPE = metricbeat

include ../common/Makefile
include ../../common/Makefile

# Collects all dependencies and then calls update
.PHONY: collect
Expand Down

0 comments on commit 2551423

Please sign in to comment.