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.

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

build: force old timer behavior #4620

Merged
merged 8 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
9 changes: 6 additions & 3 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ steps:
key: e2e
steps:
- label: "E2E: default :man_in_business_suit_levitating: (scion, ping)"
parallelism: 20
command:
- echo "--- build"
- make
Expand All @@ -116,7 +117,7 @@ steps:
- ./scion.sh run
- tools/await-connectivity
- ./bin/scion_integration || ( echo "^^^ +++" && false )
- ./bin/end2end_integration --attempts=3 || ( echo "^^^ +++" && false )
- ./bin/end2end_integration || ( echo "^^^ +++" && false )
plugins: &scion-run-hooks
- scionproto/metahook#v0.3.0:
pre-command: .buildkite/cleanup-leftovers.sh
Expand All @@ -135,21 +136,23 @@ steps:
key: e2e_integration_tests_v2
retry: *automatic-retry
- label: "E2E: failing links :man_in_business_suit_levitating:"
parallelism: 20
command:
- echo "--- build"
- make
- echo "--- start topology"
- ./scion.sh topology -c topology/default-no-peers.topo
- ./scion.sh run
- tools/await-connectivity
- ./bin/end2end_integration --attempts=3 || ( echo "^^^ +++" && false )
- ./bin/end2end_integration || ( echo "^^^ +++" && false )
- ./tools/integration/revocation_test.sh
plugins: *scion-run-hooks
artifact_paths: *scion-run-artifact-paths
timeout_in_minutes: 15
key: e2e_revocation_test_v2
retry: *automatic-retry
- label: "E2E: default :docker: (ping)"
parallelism: 20
command:
- echo "--- build"
- make build-dev docker-images
Expand All @@ -158,7 +161,7 @@ steps:
- ./scion.sh run
- tools/await-connectivity
- echo "--- run tests"
- ./bin/end2end_integration -d --attempts=3 || ( echo "^^^ +++" && false )
- ./bin/end2end_integration -d || ( echo "^^^ +++" && false )
plugins: *scion-run-hooks
artifact_paths: *scion-run-artifact-paths
timeout_in_minutes: 15
Expand Down
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ go_rules_dependencies()

go_register_toolchains(
nogo = "@//:nogo",
version = "1.23.0",
version = "1.22.7",
)

# Gazelle
Expand Down Expand Up @@ -265,7 +265,7 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")

rules_js_dependencies()

load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")
load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")

nodejs_register_toolchains(
name = "nodejs",
Expand Down
1 change: 1 addition & 0 deletions control/cmd/control/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ go_library(
"//private/trust/compat:go_default_library",
"//private/trust/grpc:go_default_library",
"//private/trust/metrics:go_default_library",
"//private/xhack:go_default_library",
"@com_github_go_chi_chi_v5//:go_default_library",
"@com_github_go_chi_cors//:go_default_library",
"@com_github_grpc_ecosystem_go_grpc_prometheus//:go_default_library",
Expand Down
3 changes: 3 additions & 0 deletions control/cmd/control/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,14 @@ import (
"github.com/scionproto/scion/private/trust/compat"
trustgrpc "github.com/scionproto/scion/private/trust/grpc"
trustmetrics "github.com/scionproto/scion/private/trust/metrics"
"github.com/scionproto/scion/private/xhack"
)

var globalCfg config.Config

func main() {
xhack.AsynctimerchanOn()

application := launcher.Application{
TOMLConfig: &globalCfg,
ShortName: "SCION Control Service",
Expand Down
1 change: 1 addition & 0 deletions gateway/cmd/gateway/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ go_library(
"//private/app:go_default_library",
"//private/app/launcher:go_default_library",
"//private/service:go_default_library",
"//private/xhack:go_default_library",
"@com_github_go_chi_chi_v5//:go_default_library",
"@com_github_go_chi_cors//:go_default_library",
"@org_golang_x_sync//errgroup:go_default_library",
Expand Down
3 changes: 3 additions & 0 deletions gateway/cmd/gateway/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,14 @@ import (
"github.com/scionproto/scion/private/app"
"github.com/scionproto/scion/private/app/launcher"
"github.com/scionproto/scion/private/service"
"github.com/scionproto/scion/private/xhack"
)

var globalCfg config.Config

func main() {
xhack.AsynctimerchanOn()

application := launcher.Application{
TOMLConfig: &globalCfg,
ShortName: "SCION IP Gateway",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,4 @@ require (
modernc.org/token v1.1.0 // indirect
)

go 1.23.0
go 1.22.7

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 0 additions & 27 deletions licenses/data/go_sdk/src/cmd/vendor/golang.org/x/build/LICENSE

This file was deleted.

27 changes: 0 additions & 27 deletions licenses/data/go_sdk/src/cmd/vendor/golang.org/x/telemetry/LICENSE

This file was deleted.

Loading
Loading