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

Fix an issue where we were trying to use a non existing directory when generating the fields.go #8729

Merged
merged 2 commits into from
Oct 24, 2018
Merged

Fix an issue where we were trying to use a non existing directory when generating the fields.go #8729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7730df2
Fix an issue where we were trying to get use a non existing directory
ph Oct 24, 2018
6da4d25
Add an XPACK_ONLY flag so we can skip some commands in libbeat
ph Oct 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion dev-tools/mage/fields.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package mage

import (
"os"
"path/filepath"

"github.com/magefile/mage/sh"
Expand All @@ -40,7 +41,11 @@ func OSSBeatDir(path ...string) string {

// Check if we need to correct ossDir because it's in x-pack.
if parentDir := filepath.Base(filepath.Dir(ossDir)); parentDir == "x-pack" {
ossDir = filepath.Join(ossDir, "../..", BeatName)
// If the OSS version of the beat exists.
tmp := filepath.Join(ossDir, "../..", BeatName)
if _, err := os.Stat(tmp); !os.IsNotExist(err) {
ossDir = tmp
}
}

return filepath.Join(append([]string{ossDir}, path...)...)
Expand Down
3 changes: 2 additions & 1 deletion libbeat/scripts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ VIRTUALENV_PARAMS?=
INTEGRATION_TESTS?=
FIND=. ${PYTHON_ENV}/bin/activate; find . -type f -not -path "*/vendor/*" -not -path "*/build/*" -not -path "*/.git/*"
PERM_EXEC?=$(shell [ `uname -s` = "Darwin" ] && echo "+111" || echo "/a+x")
XPACK_ONLY?=false

ifeq ($(DOCKER_CACHE),0)
DOCKER_NOCACHE=--no-cache
Expand Down Expand Up @@ -210,7 +211,7 @@ system-tests-environment: prepare-tests build-image
${DOCKER_COMPOSE} run -e INTEGRATION_TESTS=1 -e TESTING_ENVIRONMENT=${TESTING_ENVIRONMENT} -e DOCKER_COMPOSE_PROJECT_NAME=${DOCKER_COMPOSE_PROJECT_NAME} beat make system-tests
#This is a hack to run x-pack/filebeat module tests
@XPACKBEAT="${ES_BEATS}/x-pack/${BEAT_NAME}" ; \
if [ -e "$$XPACKBEAT/tests/system" ] ; then \
if [ -e "$$XPACKBEAT/tests/system" ] && [ $(XPACK_ONLY) = false ]; then \
$(MAKE) -C ../x-pack/${BEAT_NAME} fields; \
${DOCKER_COMPOSE} run -e INTEGRATION_TESTS=1 -e MODULES_PATH="../../x-pack/${BEAT_NAME}/module" -e TESTING_ENVIRONMENT=${TESTING_ENVIRONMENT} -e DOCKER_COMPOSE_PROJECT_NAME=${DOCKER_COMPOSE_PROJECT_NAME} beat make -C "$$XPACKBEAT" ${BEAT_NAME}.test system-tests ; \
$(MAKE) -C ../x-pack/${BEAT_NAME} fix-permissions; \
Expand Down
1 change: 1 addition & 0 deletions x-pack/functionbeat/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ TEST_ENVIRONMENT?=true
GOX_FLAGS=-arch="amd64 386 arm ppc64 ppc64le"
ES_BEATS?=../../
FIELDS_FILE_PATH=module
XPACK_ONLY?=true

# Path to the libbeat Makefile
include $(ES_BEATS)/libbeat/scripts/Makefile
Expand Down