Skip to content

Commit

Permalink
bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
avilevy18 committed Oct 26, 2023
1 parent 73902ff commit 7ccfdb1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 42 deletions.
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ override_dh_auto_build:
override_dh_auto_test:
pwd
ls -la /work/cache/opt/google-cloud-ops-agent/subagents/fluent-bit/bin
go test ./...
go test ./...
override_dh_strip_nondeterminism:
dh_strip_nondeterminism -X.jar
override_dh_auto_install:
Expand Down
41 changes: 0 additions & 41 deletions kokoro/scripts/build/build_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,44 +81,3 @@ docker run \
bash /signing/sign.sh /artifacts/*.rpm
fi
EOF

# transformation tests
if [[ "${DISTRO}" == "focal" && "${ARCH}" == "x86_64" ]]; then
TMPDIR="$(mktemp --directory)"

docker run \
-i \
-v "${TMPDIR}":/transformation_test \
build_image \
bash <<EOF
cp /work/cache/opt/google-cloud-ops-agent/subagents/fluent-bit/bin/fluent-bit /transformation_test
EOF
# install go
GO_VERSION="1.19"
gsutil cp "gs://stackdriver-test-143416-go-install/go${GO_VERSION}.linux-amd64.tar.gz" - | \
sudo tar --directory /usr/local -xzf /dev/stdin
PATH=$PATH:/usr/local/go/bin
go install -v github.com/jstemmer/go-junit-report/v2@latest
args=(
-test.parallel=1000
-timeout=3h
-flb="${TMPDIR}"
)
STDERR_STDOUT_FILE="${TMPDIR}/test_stderr_stdout.txt"
function produce_xml() {
cat "${STDERR_STDOUT_FILE}" | "$(go env GOPATH)/bin/go-junit-report" >> "${TMPDIR}/sponge_log.xml"
}
# Always run produce_xml on exit, whether the test passes or fails.
trap produce_xml EXIT
# run transformation tests
go test ./transformation_test \
"${args[@]}" \
2>&1 \
| tee "${STDERR_STDOUT_FILE}"
fi

0 comments on commit 7ccfdb1

Please sign in to comment.