Add support for --testrig

Signed-off-by: Tamal Saha <tamal@appscode.com>

Author: tamalsaha

Development.md

@@ -103,7 +103,7 @@ curl -s https://raw.githubusercontent.com/actions/runner/main/scripts/create-lat
 ## Update Webhook Host
 
 ```
-curl -fsSL -O https://github.com/appscodelabs/gh-ci-webhook/releases/download/v0.0.18/gh-ci-webhook-linux-amd64
+curl -fsSL -O https://github.com/appscodelabs/gh-ci-webhook/releases/download/v0.0.19/gh-ci-webhook-linux-amd64
 chmod +x gh-ci-webhook-linux-amd64
 mv gh-ci-webhook-linux-amd64 /usr/local/bin/gh-ci-webhook
 
@@ -113,7 +113,7 @@ systemctl stop gh-ci-webhook
 ## Update Worker hosts
 
 ```
-curl -fsSL -O https://github.com/appscodelabs/gh-ci-webhook/releases/download/v0.0.18/gh-ci-webhook-linux-amd64
+curl -fsSL -O https://github.com/appscodelabs/gh-ci-webhook/releases/download/v0.0.19/gh-ci-webhook-linux-amd64
 chmod +x gh-ci-webhook-linux-amd64
 mv gh-ci-webhook-linux-amd64 /usr/local/bin/gh-ci-webhook
 systemctl restart gh-ci-hostctl

README.md

@@ -5,15 +5,15 @@
 - Download pre-built binary into a server
 
 ```bash
-curl -fsSL -O https://github.com/appscodelabs/gh-ci-webhook/releases/download/v0.0.18/gh-ci-webhook-linux-amd64
+curl -fsSL -O https://github.com/appscodelabs/gh-ci-webhook/releases/download/v0.0.19/gh-ci-webhook-linux-amd64
 chmod +x gh-ci-webhook-linux-amd64
 mv gh-ci-webhook-linux-amd64 /usr/local/bin/gh-ci-webhook
 ```
 
 - Install systemd service
 
 ```bash
-curl -fsSL -O https://github.com/appscodelabs/gh-ci-webhook/raw/v0.0.18/hack/systemd/gh-ci-webhook.service
+curl -fsSL -O https://github.com/appscodelabs/gh-ci-webhook/raw/v0.0.19/hack/systemd/gh-ci-webhook.service
 chmod +x gh-ci-webhook.service
 
 # edit gh-ci-webhook.service file to add `--ssl --secret-key=<uuid>`

pkg/backend/processor.go

@@ -38,6 +38,7 @@ import (
 const (
 	RunnerRegular       = "firecracker"
 	RunnerHigh          = "f0"
+	RunnerTestrig       = "testrig"
 	RunnerLabelDetector = "label-detector"
 )
 
@@ -150,7 +151,7 @@ func RunsOnSelfHosted(e *github.WorkflowJobEvent) (string, bool) {
 		return "", false
 	}
 	label := e.GetWorkflowJob().Labels[0]
-	return label, label == RunnerHigh || label == RunnerRegular
+	return label, label == RunnerHigh || label == RunnerRegular || label == RunnerTestrig
 }
 
 func (mgr *Manager) ProcessCompletedMsg(payload []byte) (*github.WorkflowJobEvent, error) {

pkg/cmds/wait_for_job.go

@@ -37,8 +37,9 @@ import (
 
 func NewCmdWaitForJob() *cobra.Command {
 	var (
-		ncOpts = backend.NewNATSOptions()
-		nc     *nats.Conn
+		ncOpts  = backend.NewNATSOptions()
+		nc      *nats.Conn
+		testrig bool
 	)
 	cmd := &cobra.Command{
 		Use:               "wait-for-job",
@@ -58,7 +59,7 @@ func NewCmdWaitForJob() *cobra.Command {
 
 			var event *github.WorkflowJobEvent
 			for {
-				event, err = wait_until_job(nc)
+				event, err = wait_until_job(nc, testrig)
 				if err != nil {
 					klog.ErrorS(err, "error while waiting for next job")
 				}
@@ -89,12 +90,13 @@ export labels=%s
 	}
 
 	ncOpts.AddFlags(cmd.Flags())
+	cmd.Flags().BoolVar(&testrig, "testrig", testrig, "Prefer testrig")
 
 	return cmd
 }
 
 // https://natsbyexample.com/examples/jetstream/workqueue-stream/go
-func wait_until_job(nc *nats.Conn) (*github.WorkflowJobEvent, error) {
+func wait_until_job(nc *nats.Conn, testrig bool) (*github.WorkflowJobEvent, error) {
 	js, err := jetstream.New(nc)
 	if err != nil {
 		return nil, err
@@ -111,9 +113,20 @@ func wait_until_job(nc *nats.Conn) (*github.WorkflowJobEvent, error) {
 
 	defer printStreamState(ctx, streamQueued)
 
-	payload, err := consumeMsg(ctx, streamQueued, streamName+"."+backend.RunnerHigh)
-	if err != nil || len(payload) == 0 {
-		payload, err = consumeMsg(ctx, streamQueued, streamName+"."+backend.RunnerRegular)
+	subjects := []string{
+		streamName + "." + backend.RunnerHigh,
+		streamName + "." + backend.RunnerRegular,
+	}
+	if testrig {
+		subjects = append([]string{streamName + "." + backend.RunnerTestrig}, subjects...)
+	}
+
+	var payload []byte
+	for _, subj := range subjects {
+		payload, err = consumeMsg(ctx, streamQueued, subj)
+		if err == nil && len(payload) > 0 {
+			break
+		}
 	}
 	if err != nil {
 		return nil, err

pkg/providers/firecracker/cloud_init.go

@@ -256,6 +256,8 @@ rsync --archive --chown=$USER:$USER ~/.docker /home/$USER
 su $USER
 cd /home/$USER
 
+export TESTRIG=%v
+
 export NATS_URL=%s
 export NATS_USERNAME=%s
 export NATS_PASSWORD=%s
@@ -270,8 +272,8 @@ export RUNNER_NAME=%s
 # curl -s https://raw.githubusercontent.com/actions/runner/main/scripts/create-latest-svc.sh | bash -s -- -s ${RUNNER_OWNER} -n ${RUNNER_NAME} -f
 # ephemeral runner: https://docs.github.com/en/actions/hosting-your-own-runners/autoscaling-with-self-hosted-runners#using-ephemeral-runners-for-autoscaling
 # https://github.blog/changelog/2021-09-20-github-actions-ephemeral-self-hosted-runners-new-webhooks-for-auto-scaling/
-curl -fsSL https://gist.githubusercontent.com/tamalsaha/af2f99c80f84410253bd1e532bdfabc7/raw/bcb7b7379c050fb96260ce2cfa83485007275b44/start-runner.sh | bash -s -- -n ${RUNNER_NAME} -f
-`, string(dockerHubToken), DefaultOptions.NatsURL, DefaultOptions.NatsUsername, DefaultOptions.NatsPassword, ghToken, runnerName)
+curl -fsSL https://gist.githubusercontent.com/tamalsaha/af2f99c80f84410253bd1e532bdfabc7/raw/1ea50be2e954fcde2fd2bce377ac168d799ccf38/start-runner.sh | bash -s -- -n ${RUNNER_NAME} -f
+`, string(dockerHubToken), DefaultOptions.Testrig, DefaultOptions.NatsURL, DefaultOptions.NatsUsername, DefaultOptions.NatsPassword, ghToken, runnerName)
 
 	udBytes, err := PrepareCloudInitUserData(userData, script)
 	if err != nil {

pkg/providers/firecracker/opts.go

@@ -45,6 +45,8 @@ type Options struct {
 	NatsURL      string
 	NatsUsername string
 	NatsPassword string
+
+	Testrig bool
 }
 
 var DefaultOptions = NewOptions()
@@ -76,6 +78,8 @@ func (opts *Options) AddFlags(fs *pflag.FlagSet) {
 	fs.IntVar(&opts.NumInstances, "firecracker.num-instances", opts.NumInstances, "Number of parallel instances")
 	fs.Int64Var(&opts.VcpuCount, "firecracker.vcpu-count", opts.VcpuCount, "Vcpu count for a single instance")
 	fs.Int64Var(&opts.MemSizeMib, "firecracker.mem-size-mib", opts.MemSizeMib, "Size(MiB) of memory for a single instance")
+
+	fs.BoolVar(&opts.Testrig, "testrig", opts.Testrig, "Prefer testrig")
 }
 
 /*