Skip to content

Commit

Permalink
fix packet interdomain testing
Browse files Browse the repository at this point in the history
Signed-off-by: denis-tingaikin <[email protected]>
  • Loading branch information
denis-tingaikin committed Oct 11, 2022
1 parent 78540e8 commit 47cace4
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 190 deletions.
5 changes: 4 additions & 1 deletion entry_point_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// Copyright (c) 2021 Doc.ai and/or its affiliates.
//
// Copyright (c) 2022 Cisco and/or its affiliates.
//
// SPDX-License-Identifier: Apache-2.0
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -21,10 +23,11 @@ import (
"os"
"testing"

"github.com/networkservicemesh/integration-tests/suites/floating_interdomain"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // This is required for GKE authentication

"github.com/networkservicemesh/integration-tests/suites/floating_interdomain"
)

func TestFloatingInterdomainBasicSuite(t *testing.T) {
Expand Down
22 changes: 10 additions & 12 deletions packet/packet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,24 @@ providers:
- KUBERNETES_VERSION
packet:
ssh-key: sshkey.pub
hardware-devices:
devices:
- name: "interdomain-Master"
host-name: "SR-IOV-Master-${CLUSTER_NAME}"
os: "ubuntu_20_04"
billing-cycle: "hourly"
port-vlans:
eth3: 1044
plan: "n3.xlarge.x86"
- name: "interdomain-Worker"
host-name: "SR-IOV-Worker-${CLUSTER_NAME}"
os: "ubuntu_20_04"
billing-cycle: "hourly"
port-vlans:
eth3: 1044
hardware-reservations:
- 2cf78481-53b0-46c8-a084-6e9815acdb0b
- 2361d3c2-f694-4fa7-a683-a9f69e2abe7c
- 70b51e39-2e65-4a64-8191-dd28386c0b80
- 4f27da36-a911-45a5-ab81-0e789348e3fe
- 7741d4a8-8555-492b-8d73-63c2f0715d16
- d173dbde-8510-454e-b0c2-c120c397cdf5
plan: "n3.xlarge.x86"
facilities:
- baremetal
- backend_transfer
- layer_2
- global_ipv4
- ibx
preferred-facility: da11
scripts:
install: "echo all deps installed"
setup: |
Expand Down
6 changes: 0 additions & 6 deletions scripts/packet/create-kubernetes-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@ function wait_pids() {
return 0
}

# Setup SR-IOV
pids=""
/bin/bash scripts/packet/sriov/setup-SRIOV.sh "${master_ip}" "${worker_ip}" "${SSH_OPTS}" &
pids+=" $!"
wait_pids "${pids}" "SR-IOV config failed" || exit 1

# Create k8s scripts directory on nodes
ssh ${SSH_OPTS} root@${master_ip} mkdir k8s
ssh ${SSH_OPTS} root@${worker_ip} mkdir k8s
Expand Down
2 changes: 1 addition & 1 deletion scripts/packet/k8s/start-master.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mkdir -p "$HOME"/.kube
sudo cp -f /etc/kubernetes/admin.conf "$HOME"/.kube/config
sudo chown "$(id -u):$(id -g)" "$HOME"/.kube/config

kubectl apply -f "https://cloud.weave.works/k8s/net?k8s-version=$(kubectl version | base64 | tr -d '\n')&env.IPALLOC_RANGE=192.168.0.0/16"
kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.24.1/manifests/calico.yaml

kubectl taint nodes --all node-role.kubernetes.io/master-

Expand Down
58 changes: 0 additions & 58 deletions scripts/packet/sriov/config-SRIOV.sh

This file was deleted.

6 changes: 0 additions & 6 deletions scripts/packet/sriov/enable-SRIOV.sh

This file was deleted.

21 changes: 0 additions & 21 deletions scripts/packet/sriov/enable-VFIO.sh

This file was deleted.

85 changes: 0 additions & 85 deletions scripts/packet/sriov/setup-SRIOV.sh

This file was deleted.

0 comments on commit 47cace4

Please sign in to comment.