adjust CI configuration

elastic · Feb 11, 2020 · f86e3d9 · f86e3d9
1 parent 0a9637f
commit f86e3d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -414,14 +414,14 @@ pipeline {
             stage('Generators Metricbeat Linux'){
               steps {
                 withBeatsEnv(){
-                  makeTarget("Generators Metricbeat Linux", "-C generator/metricbeat test test-package")
+                  makeTarget("Generators Metricbeat Linux", "-C generator/_templates/metricbeat test test-package")
                 }
               }
             }
             stage('Generators Beat Linux'){
               steps {
                 withBeatsEnv(){
-                  makeTarget("Generators Beat Linux", "-C generator/beat test test-package")
+                  makeTarget("Generators Beat Linux", "-C generator/_templates/beat test test-package")
                 }
               }
             }
@@ -430,7 +430,7 @@ pipeline {
               options { skipDefaultCheckout() }
               steps {
                 withBeatsEnv(){
-                  makeTarget("Generators Metricbeat Mac OS X", "-C generator/metricbeat test")
+                  makeTarget("Generators Metricbeat Mac OS X", "-C generator/_templates/metricbeat test")
                 }
               }
             }
@@ -439,7 +439,7 @@ pipeline {
               options { skipDefaultCheckout() }
               steps {
                 withBeatsEnv(){
-                  makeTarget("Generators Beat Mac OS X", "-C generator/beat test")
+                  makeTarget("Generators Beat Mac OS X", "-C generator/_templates/beat test")
                 }
               }
             }

diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1
@@ -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"