Skip to content

Commit

Permalink
fix(instance-maanger): add ldflags when building instance manager
Browse files Browse the repository at this point in the history
ref: longhorn/longhorn 8094

Signed-off-by: Jack Lin <jack.lin@suse.com>
  • Loading branch information
ChanYiLin authored and innobead committed Mar 13, 2024
1 parent 9d57f19 commit 69c0045
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ RUN cd integration && \
RUN cd /go/src/github.com/longhorn && \
git clone https://github.com/longhorn/longhorn-instance-manager.git && \
cd longhorn-instance-manager && \
go build -o ./longhorn-instance-manager && \
go build -o ./longhorn-instance-manager -tags netgo -ldflags "-linkmode external -extldflags -static" && \
cp -r integration/rpc/ ${DAPPER_SOURCE}/integration/rpc/ && \
install longhorn-instance-manager /usr/local/bin

Expand Down
16 changes: 7 additions & 9 deletions integration/instance/test_launcher_basic.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import tempfile

import pytest
import grpc

from common.core import (
create_replica_process, create_engine_process,
Expand All @@ -18,6 +17,7 @@
from common.constants import (
LONGHORN_UPGRADE_BINARY, SIZE,
PROC_STATE_RUNNING, PROC_STATE_STOPPING, PROC_STATE_STOPPED,
PROC_STATE_ERROR,
VOLUME_NAME_BASE, ENGINE_NAME_BASE, REPLICA_NAME_BASE,
REPLICA_NAME, REPLICA_2_NAME, SIZE_STR,
INSTANCE_MANAGER_REPLICA,
Expand Down Expand Up @@ -80,17 +80,15 @@ def test_process_creation_failure(pm_client): # NOQA
for i in range(count):
tmp_dir = tempfile.mkdtemp()
name = REPLICA_NAME_BASE + str(i)

args = ["replica", tmp_dir, "--size", str(SIZE)]
with pytest.raises(grpc.RpcError) as e:
pm_client.process_create(
name=name, binary="/engine-binaries/opt/non-existing-binary",
args=args, port_count=15, port_args=["--listen,localhost:"])
assert e.value.code() == grpc.StatusCode.INVALID_ARGUMENT
pm_client.process_create(
name=name, binary="/engine-binaries/opt/non-existing-binary",
args=args, port_count=15, port_args=["--listen,localhost:"])

rs = pm_client.process_list()
assert len(rs) == 0

assert len(rs) == 5
for name, r in rs.items():
assert r.status.state == PROC_STATE_ERROR

def test_one_volume(pm_client, em_client): # NOQA
rs = pm_client.process_list()
Expand Down

0 comments on commit 69c0045

Please sign in to comment.