Skip to content

Commit

Permalink
Optimize musl (#511)
Browse files Browse the repository at this point in the history
* allow makefile to be configure for target
use musl for running k8 smoke test in ci

* rebase from master
  • Loading branch information
sehz authored Nov 24, 2020
1 parent d1a4dcb commit 2639684
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 14 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,16 +174,15 @@ jobs:
minikube status
- name: Build
run: |
make RELEASE=release build_test
make RELEASE=release TARGET=x86_64-unknown-linux-musl build_test
- name: Setup installation pre-requisites
run: |
FLV_CMD=true ./target/release/fluvio cluster install --setup --develop
FLV_CMD=true ./target/release/fluvio cluster check --pre-install
FLV_CMD=true make RELEASE=true TARGET=x86_64-unknown-linux-musl k8-setup
- name: Make image
run: make RELEASE=true minikube_image
- name: Run smoke-test-k8-tls-root
run: |
FLV_CMD=true FLV_SOCKET_WAIT=600 make RELEASE=true UNINSTALL=noclean smoke-test-k8-tls-root
run: |
FLV_CMD=true FLV_SOCKET_WAIT=600 make RELEASE=true TARGET=x86_64-unknown-linux-musl UNINSTALL=noclean smoke-test-k8-tls-root
- run: minikube delete
- name: Save logs
if: failure()
Expand Down
23 changes: 14 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ TARGET_LINUX=x86_64-unknown-linux-musl
TARGET_DARWIN=x86_64-apple-darwin
CLI_BUILD=fluvio_cli
TEST_BUILD=$(if $(RELEASE),release,debug)
FLUVIO_BIN=./target/$(TEST_BUILD)/fluvio
TEST_TARGET=$(if $(TARGET),--target $(TARGET),)
FLUVIO_BIN=$(if $(TARGET),./target/$(TARGET)/$(TEST_BUILD)/fluvio,./target/$(TEST_BUILD)/fluvio)
CLIENT_LOG=warn
SERVER_LOG=debug
TEST_LOG=warn
TEST_BIN_DEBUG=FLV_CMD=true RUST_LOG=$(TEST_LOG) ./target/debug/flv-test
TEST_BIN=FLV_CMD=true ./target/$(TEST_BUILD)/flv-test
TEST_BIN_INNER=$(if $(TARGET),./target/$(TARGET)/$(TEST_BUILD)/flv-test,./target/$(TEST_BUILD)/flv-test)
TEST_BIN=FLV_CMD=true $(TEST_BIN_INNER)
TEST_LOG=--client-log ${CLIENT_LOG} --server-log ${SERVER_LOG}
DEFAULT_SPU=1
DEFAULT_ITERATION=5
Expand All @@ -30,20 +31,20 @@ install_tools_mac:

build_test: TEST_RELEASE_FLAG=$(if $(RELEASE),--release,)
build_test:
cargo build $(TEST_RELEASE_FLAG) --bin fluvio;
cargo build $(TEST_RELEASE_FLAG) --bin flv-test
cargo build $(TEST_RELEASE_FLAG) $(TEST_TARGET) --bin fluvio;
cargo build $(TEST_RELEASE_FLAG) $(TEST_TARGET) --bin flv-test

#
# List of smoke test steps. This is used by CI
#

smoke-test: build_test test-clean-up
smoke-test: test-clean-up
$(TEST_BIN) --spu ${DEFAULT_SPU} --produce-iteration ${DEFAULT_ITERATION} --local ${TEST_LOG} ${SKIP_CHECK}

smoke-test-tls: build_test test-clean-up
smoke-test-tls: test-clean-up
$(TEST_BIN) --spu ${DEFAULT_SPU} --produce-iteration ${DEFAULT_ITERATION} --tls --local ${TEST_LOG} ${SKIP_CHECK}

smoke-test-tls-policy: build_test test-clean-up
smoke-test-tls-policy: test-clean-up
AUTH_POLICY=$(SC_AUTH_CONFIG)/policy.json X509_AUTH_SCOPES=$(SC_AUTH_CONFIG)/scopes.json \
FLV_SPU_DELAY=$(SPU_DELAY) \
$(TEST_BIN) --spu ${DEFAULT_SPU} --produce-iteration ${DEFAULT_ITERATION} --tls --local ${TEST_LOG} ${SKIP_CHECK}
Expand All @@ -62,6 +63,10 @@ test-permission-user1:
topic create test3 2> /tmp/topic.err
grep -q permission /tmp/topic.err

k8-setup:
$(FLUVIO_BIN) cluster install --setup --develop
# $(FLUVIO_BIN) cluster check --pre-install


smoke-test-k8: test-clean-up minikube_image
$(TEST_BIN) --spu ${DEFAULT_SPU} --produce-iteration ${DEFAULT_ITERATION} --develop ${TEST_LOG} ${SKIP_CHECK}
Expand Down Expand Up @@ -95,7 +100,7 @@ test-rbac:
AUTH_POLICY=$(POLICY_FILE) X509_AUTH_SCOPES=$(SCOPE) make smoke-test-tls DEFAULT_LOG=fluvio=debug


test-clean-up:
test-clean-up: build_test
ifeq ($(UNINSTALL),noclean)
echo "no clean"
else
Expand Down

0 comments on commit 2639684

Please sign in to comment.