Skip to content

USHIFT-1298: enable cgo to support loading local libraries #1869

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

Merged
openshift-merge-robot merged 3 commits into from
Jun 6, 2023
Merged

USHIFT-1298: enable cgo to support loading local libraries #1869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84f46c9
USHIFT-1298: enable cgo to support loading local libraries
dhellmann May 31, 2023
6076906
run test scripts with bash explicitly
dhellmann Jun 5, 2023
270b2de
fix pvc name in resize test
dhellmann Jun 5, 2023
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
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ GO_BUILD_FLAGS :=-tags 'include_gcs include_oss containers_image_openpgp gssapi
GO_TEST_FLAGS=$(GO_BUILD_FLAGS)
GO_TEST_PACKAGES=./cmd/... ./pkg/...

all: generate-config microshift etcd
# Enable CGO when building microshift binary for access to local libraries.
# Use an environment variable to allow CI to disable when cross-compiling.
export CGO_ENABLED ?= 1

# target "build:" defined in vendor/github.com/openshift/build-machinery-go/make/targets/golang/build.mk
# Disable CGO when building microshift binary
build: export CGO_ENABLED=0
all: generate-config microshift etcd

microshift: build

Expand Down
4 changes: 1 addition & 3 deletions e2e/main.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,10 @@ run_test() {

konfig=$(microshift_get_konfig)
trap 'rm -f "${konfig}"' RETURN

chmod +x "${SCRIPT_DIR}/tests/${test}"

test_start=$(date +%s)
set +e
KUBECONFIG="${konfig}" "${SCRIPT_DIR}/tests/${test}" &>"${output}/0010-test.log"
KUBECONFIG="${konfig}" bash "${SCRIPT_DIR}/tests/${test}" &>"${output}/0010-test.log"
res=$?
set -e
test_dur=$(($(date +%s) - test_start))
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/0050-pvc-resize.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ oc wait --for=condition=Ready --timeout=120s pod/test-pod

RESIZE_TO=2Gi
TIME_OUT=3m
oc patch pvc my-pvc -p '{"spec":{"resources":{"requests":{"storage":"'${RESIZE_TO}'"}}}}'
oc wait --timeout ${TIME_OUT} --for=jsonpath="{.spec.resources.requests.storage}"=${RESIZE_TO} pvc/my-pvc
oc patch pvc test-claim -p '{"spec":{"resources":{"requests":{"storage":"'${RESIZE_TO}'"}}}}'
oc wait --timeout ${TIME_OUT} --for=jsonpath="{.spec.resources.requests.storage}"=${RESIZE_TO} pvc/test-claim
6 changes: 3 additions & 3 deletions etcd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ include ./vendor/github.com/openshift/build-machinery-go/make/targets/openshift/
OUTPUT_DIR := ../_output
GO_BUILD_BINDIR := $(OUTPUT_DIR)/bin

all: export CGO_ENABLED=0

build: export CGO_ENABLED=0
# Enable CGO when building microshift binary for access to local libraries.
# Use an environment variable to allow CI to disable when cross-compiling.
export CGO_ENABLED ?= 1

vendor:
go mod vendor
Expand Down