Skip to content

Commit

Permalink
fix runner issue
Browse files Browse the repository at this point in the history
Signed-off-by: JooYoung Park <[email protected]>
  • Loading branch information
JooyoungPark73 committed Mar 4, 2024
1 parent 73aa855 commit c56ab31
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 9 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ jobs:
sudo apt update
sudo apt install git -y
- name: Add rsync
run: |
sudo apt update
sudo apt install rsync -y
- name: Check out code into the Go module directory
uses: actions/checkout@v4
with:
Expand Down
20 changes: 12 additions & 8 deletions scripts/github_runner/conf.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
{
"ghOrg": "<GitHub account>",
"ghBranch": "<GitHub branch>",
"ghPat": "<GitHub PAT>",
"hostUsername": "ubuntu",
"hostUsername": "root",
"runners": {
"pc91.cloudlab.umass.edu": {
"10.96.190.31": {
"type": "cri",
"sandbox": "firecracker"
},
"pc101.cloudlab.umass.edu": {
"10.96.190.176": {
"type": "cri",
"sandbox": "gvisor",
"restart": true
"sandbox": "gvisor"
},
"pc72.cloudlab.umass.edu": {
"10.96.190.94": {
"type": "integ",
"num": 2
"num": 2,
"restart": false
},
"10.96.190.53": {
"type": "profile"
}
}
}
}
3 changes: 2 additions & 1 deletion scripts/github_runner/deploy_runners.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ type RunnerConf struct {

type DeployerConf struct {
GhOrg string `json:"ghOrg"`
GhBranch string `json:"ghBranch"`
GhPat string `json:"ghPat"`
HostUsername string `json:"hostUsername"`
RunnerConfs map[string]RunnerConf `json:"runners"`
Expand Down Expand Up @@ -122,7 +123,7 @@ func deployRunner(host string, runnerConf RunnerConf, deployerConf *DeployerConf
}

log.Debugf("Cloning vHive repository on %s@%s", deployerConf.HostUsername, host)
out, err := client.Exec(fmt.Sprintf("rm -rf ./vhive ./actions-runner && git clone --depth=1 https://github.com/%s/vhive", deployerConf.GhOrg))
out, err := client.Exec(fmt.Sprintf("rm -rf ./vhive ./actions-runner && git clone --depth=1 --branch=%s https://github.com/%s/vhive", deployerConf.GhBranch, deployerConf.GhOrg))
log.Debug(string(out))
if err != nil {
log.Fatalf("Failed to clone vHive repository on %s@%s: %s", deployerConf.HostUsername, host, err)
Expand Down

0 comments on commit c56ab31

Please sign in to comment.