Skip to content

Commit

Permalink
change github raw path, update workflows yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
jchua99 committed Jan 23, 2024
1 parent 02a006b commit e80beae
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/openyurt-unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,5 @@ jobs:
cat ~/.ssh/authorized_keys
chmod og-rw ~/.ssh

cd scripts/openyurt-deployer/node
cd scripts/openyurt-deployer
go test
4 changes: 2 additions & 2 deletions scripts/openyurt-deployer/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ func (node *Node) YurtWorkerJoin(addr string, port string, token string) {
var err error

// Get yurt template from github
yurtTempFilePath, _ := node.DownloadToTmpDir("https://raw.githubusercontent.com/vhive-serverless/vHive/main/scripts/openyurt-deployer/configs/yurtTemplate.yaml")
yurtTempFilePath, _ := node.DownloadToTmpDir("https://raw.githubusercontent.com/vhive-serverless/vHive/openyurt/scripts/openyurt-deployer/configs/yurtTemplate.yaml")
// Set up Yurthub
utils.WaitPrintf("Setting up Yurthub")
_, err = node.ExecShellCmd(
Expand All @@ -895,7 +895,7 @@ func (node *Node) YurtWorkerJoin(addr string, port string, token string) {
utils.CheckErrorWithMsg(err, "Failed to set up Yurthub!\n")

// Get kubele template from github
kubletTempFilePath, _ := node.DownloadToTmpDir("https://raw.githubusercontent.com/vhive-serverless/vHive/main/scripts/openyurt-deployer/configs/kubeTemplate.yaml")
kubletTempFilePath, _ := node.DownloadToTmpDir("https://raw.githubusercontent.com/vhive-serverless/vHive/openyurt/scripts/openyurt-deployer/configs/kubeTemplate.yaml")
// Configure Kubelet
utils.WaitPrintf("Configuring kubelet")
node.ExecShellCmd("sudo mkdir -p /var/lib/openyurt && cat '%s' | sudo tee /var/lib/openyurt/kubelet.conf", kubletTempFilePath)
Expand Down
16 changes: 0 additions & 16 deletions scripts/openyurt-deployer/node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@
package main

import (
"strings"
"testing"

"github.com/sfreiberg/simplessh"
"github.com/vhive-serverless/vHive/scripts/utils"
)

var githubRunner = "[email protected]"
Expand All @@ -44,18 +40,6 @@ var mockNode = Node{
},
}

func SetupSSHConn(nodeName string) *simplessh.Client {
utils.InfoPrintf("Connecting to %s\n", nodeName)
splits := strings.Split(nodeName, "@")
username := splits[0]
host := splits[1]
client, err := simplessh.ConnectWithAgent(host, username)
if err != nil {
utils.FatalPrintf("Failed to connect to: %s:%s\n", nodeName, err)
}
return client
}

func TestDetectArch(t *testing.T) {
// Call the method to be tested
mockNode.DetectArch()
Expand Down

0 comments on commit e80beae

Please sign in to comment.