diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 265f8f109..9ddfc2c0e 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -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: diff --git a/scripts/github_runner/conf.json b/scripts/github_runner/conf.json index 64159a385..d577cfc45 100644 --- a/scripts/github_runner/conf.json +++ b/scripts/github_runner/conf.json @@ -1,20 +1,24 @@ { "ghOrg": "", + "ghBranch": "", "ghPat": "", - "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" } } -} +} \ No newline at end of file diff --git a/scripts/github_runner/deploy_runners.go b/scripts/github_runner/deploy_runners.go index 8bec00e1e..b4ca00609 100644 --- a/scripts/github_runner/deploy_runners.go +++ b/scripts/github_runner/deploy_runners.go @@ -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"` @@ -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)