Bump runner version for testing

Co-authored-by: Christopher Johnson <thchrisjohnson@github.com>

.github/workflows/build.yml

@@ -18,12 +18,28 @@ jobs:
   build:
     strategy:
       matrix:
-        runtime: [ linux-x64 ]
+        runtime: [ linux-x64, linux-arm64, linux-arm, win-x64, osx-x64 ]
         include:
         - runtime: linux-x64
           os: ubuntu-latest
           devScript: ./dev.sh
 
+        - runtime: linux-arm64
+          os: ubuntu-latest
+          devScript: ./dev.sh
+
+        - runtime: linux-arm
+          os: ubuntu-latest
+          devScript: ./dev.sh
+
+        - runtime: osx-x64
+          os: macOS-latest
+          devScript: ./dev.sh
+
+        - runtime: win-x64
+          os: windows-latest
+          devScript: ./dev
+
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v1
@@ -34,6 +50,13 @@ jobs:
         ${{ matrix.devScript }} layout Release ${{ matrix.runtime }}
       working-directory: src
 
+    # Run tests
+    - name: L0
+      run: |
+        ${{ matrix.devScript }} test
+      working-directory: src
+      if: matrix.runtime != 'linux-arm64' && matrix.runtime != 'linux-arm'
+
     # Create runner package tar.gz/zip
     - name: Package Release
       if: github.event_name != 'pull_request'
@@ -48,18 +71,3 @@ jobs:
       with:
         name: runner-package-${{ matrix.runtime }}
         path: _package
-    
-    - name: Build old version
-      run: |
-        echo 2.270.0 > runnerversion
-        ${{ matrix.devScript }} layout Release ${{ matrix.runtime }}
-        ${{ matrix.devScript }} package Release
-      working-directory: src
-
-    # Upload runner package tar.gz/zip as artifact
-    - name: Publish Artifact old
-      if: github.event_name != 'pull_request'
-      uses: actions/upload-artifact@v1
-      with:
-        name: runner-package-${{ matrix.runtime }}-old
-        path: _package

Dockerfile

@@ -1,57 +0,0 @@
-FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-buster-slim
-
-ENV RUNNER_CONFIG_URL=""
-ENV GITHUB_PAT=""
-ENV RUNNER_NAME=""
-ENV RUNNER_GROUP=""
-ENV RUNNER_LABELS=""
-# ENV GITHUB_RUNNER_SCOPE=""
-# ENV GITHUB_SERVER_URL=""
-# ENV GITHUB_API_URL=""
-# ENV K8S_HOST_IP=""
-
-RUN apt-get update --fix-missing \
-    && apt-get install -y --no-install-recommends \
-    curl \
-    jq \
-    apt-utils \
-    apt-transport-https \
-    unzip \
-    net-tools\
-    gnupg2\
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install kubectl
-RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
-    echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list && \
-    apt-get update && apt-get -y install --no-install-recommends kubectl
-
-# Install docker
-RUN curl -fsSL https://get.docker.com -o get-docker.sh
-RUN sh get-docker.sh
-
-
-# Allow runner to run as root
-ENV RUNNER_ALLOW_RUNASROOT=1
-
-# Directory for runner to operate in
-RUN mkdir /actions-runner
-WORKDIR /actions-runner
-COPY ./src/Misc/download-runner.sh /actions-runner/download-runner.sh
-COPY ./src/Misc/entrypoint.sh /actions-runner/entrypoint.sh
-# COPY ./src/Misc/jobstart.sh /actions-runner/jobstart.sh
-# COPY ./src/Misc/jobrunning.sh /actions-runner/jobrunning.sh
-# COPY ./src/Misc/jobcomplete.sh /actions-runner/jobcomplete.sh
-COPY ./src/Misc/runner_lifecycle.sh /actions-runner/runner_lifecycle.sh
-
-RUN /actions-runner/download-runner.sh
-RUN rm -f /actions-runner/download-runner.sh
-
-# ENV _INTERNAL_JOBSTART_NOTIFICATION=/actions-runner/jobstart.sh
-# ENV _INTERNAL_JOBRUNNING_NOTIFICATION=/actions-runner/jobrunning.sh
-# ENV _INTERNAL_JOBCOMPLETE_NOTIFICATION=/actions-runner/jobcomplete.sh
-ENV _INTERNAL_RUNNER_LIFECYCLE_NOTIFICATION=/actions-runner/runner_lifecycle.sh
-
-
-ENTRYPOINT ["./entrypoint.sh"] 

Dockerfile.dind

@@ -1,46 +0,0 @@
-FROM docker:19.03
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-RUN set -eux; \
-	apk add --no-cache \
-		btrfs-progs \
-		e2fsprogs \
-		e2fsprogs-extra \
-		iptables \
-		openssl \
-		shadow-uidmap \
-		xfsprogs \
-		xz \
-# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation)
-		pigz \
-	; \
-# only install zfs if it's available for the current architecture
-# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01)
-# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch
-	if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \
-		apk add --no-cache zfs; \
-	fi
-
-# TODO aufs-tools
-
-# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
-RUN set -x \
-	&& addgroup -S dockremap \
-	&& adduser -S -G dockremap dockremap \
-	&& echo 'dockremap:165536:65536' >> /etc/subuid \
-	&& echo 'dockremap:165536:65536' >> /etc/subgid
-
-# https://github.com/docker/docker/tree/master/hack/dind
-ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377
-
-RUN set -eux; \
-	wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \
-	chmod +x /usr/local/bin/dind
-
-COPY dockerd-entrypoint.sh /usr/local/bin/
-
-VOLUME /var/lib/docker
-EXPOSE 6788 6789
-
-ENTRYPOINT ["dockerd-entrypoint.sh"]
-CMD []

autoscalev0.yaml

@@ -1,14 +0,0 @@
-apiVersion: actions.summerwind.dev/v1alpha1
-kind: RunnerDeployment
-metadata:
-  name: auto-scale-runners
-spec:
-  replicas: 1
-  maxRunnerLimit: 5
-  template:
-    spec:
-      configURL: https://github.com/bbq-beets/ting-test
-      githubTokenSecretKeyRef:
-        name: githubtoken
-        key: GITHUB_PAT
-

deployment.yaml

@@ -1,63 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: runner-pod
-  labels:
-    name: runner-pod
-spec:
-  containers:
-  - name: runner-pod
-    image: huangtingluo/autoscale-runner:v0.0
-    imagePullPolicy: Always
-    env:
-      - name: GITHUB_PAT
-        value: 62c13e14e947958516c103a9584f66227697c447
-      - name: GITHUB_RUNNER_SCOPE
-        value: monalisa/main123
-      - name: K8S_HOST_IP
-        value: "192.168.120.1"
-
-# apiVersion: apps/v1
-# kind: Deployment
-# metadata:
-#   name: runner-deployment
-# spec:
-#   replicas: 1
-#   selector:
-#     matchLabels:
-#       app: runners
-#   template:
-#     metadata:
-#       labels:
-#         app: runners
-#     spec:
-#       # hostNetwork: true
-#       # volumes:
-#       # - name: docker-storage
-#       #   emptyDir: {}
-#       # containers:
-#       # - name: docker-host
-#       #   image: docker:18.05-dind
-#       #   imagePullPolicy: Always
-#       #   securityContext:
-#       #     privileged: true
-#       #   volumeMounts:
-#       #   - name: docker-storage
-#       #     mountPath: /var/lib/docker
-
-#       # hostNetwork: true
-#       containers:
-#       - name: runner
-#         image: huangtingluo/autoscale-runner:v0.0
-#         imagePullPolicy: Always
-#         env:
-#           - name: GITHUB_PAT
-#             value: 62c13e14e947958516c103a9584f66227697c447
-#           - name: GITHUB_RUNNER_SCOPE
-#             value: monalisa/main123
-#           - name: K8S_HOST_IP
-#             value: "192.168.120.1"
-#         resources:
-#           limits:
-#             memory: "128Mi"
-#             cpu: "500m"

dockerd-entrypoint.sh

@@ -1,186 +0,0 @@
-#!/bin/sh
-set -eu
-
-_tls_ensure_private() {
-	local f="$1"; shift
-	[ -s "$f" ] || openssl genrsa -out "$f" 4096
-}
-_tls_san() {
-	{
-		ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }'
-		{
-			cat /etc/hostname
-			echo 'docker'
-			echo 'localhost'
-			hostname -f
-			hostname -s
-		} | sed 's/^/DNS:/'
-		[ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN"
-	} | sort -u | xargs printf '%s,' | sed "s/,\$//"
-}
-_tls_generate_certs() {
-	local dir="$1"; shift
-
-	# if ca/key.pem || !ca/cert.pem, generate CA public if necessary
-	# if ca/key.pem, generate server public
-	# if ca/key.pem, generate client public
-	# (regenerating public certs every startup to account for SAN/IP changes and/or expiration)
-
-	# https://github.com/FiloSottile/mkcert/issues/174
-	local certValidDays='825'
-
-	if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then
-		# if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA
-		mkdir -p "$dir/ca"
-		_tls_ensure_private "$dir/ca/key.pem"
-		openssl req -new -key "$dir/ca/key.pem" \
-			-out "$dir/ca/cert.pem" \
-			-subj '/CN=docker:dind CA' -x509 -days "$certValidDays"
-	fi
-
-	if [ -s "$dir/ca/key.pem" ]; then
-		# if we have a CA private key, we should create/manage a server key
-		mkdir -p "$dir/server"
-		_tls_ensure_private "$dir/server/key.pem"
-		openssl req -new -key "$dir/server/key.pem" \
-			-out "$dir/server/csr.pem" \
-			-subj '/CN=docker:dind server'
-		cat > "$dir/server/openssl.cnf" <<-EOF
-			[ x509_exts ]
-			subjectAltName = $(_tls_san)
-		EOF
-		openssl x509 -req \
-				-in "$dir/server/csr.pem" \
-				-CA "$dir/ca/cert.pem" \
-				-CAkey "$dir/ca/key.pem" \
-				-CAcreateserial \
-				-out "$dir/server/cert.pem" \
-				-days "$certValidDays" \
-				-extfile "$dir/server/openssl.cnf" \
-				-extensions x509_exts
-		cp "$dir/ca/cert.pem" "$dir/server/ca.pem"
-		openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem"
-	fi
-
-	if [ -s "$dir/ca/key.pem" ]; then
-		# if we have a CA private key, we should create/manage a client key
-		mkdir -p "$dir/client"
-		_tls_ensure_private "$dir/client/key.pem"
-		chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts
-		openssl req -new \
-				-key "$dir/client/key.pem" \
-				-out "$dir/client/csr.pem" \
-				-subj '/CN=docker:dind client'
-		cat > "$dir/client/openssl.cnf" <<-'EOF'
-			[ x509_exts ]
-			extendedKeyUsage = clientAuth
-		EOF
-		openssl x509 -req \
-				-in "$dir/client/csr.pem" \
-				-CA "$dir/ca/cert.pem" \
-				-CAkey "$dir/ca/key.pem" \
-				-CAcreateserial \
-				-out "$dir/client/cert.pem" \
-				-days "$certValidDays" \
-				-extfile "$dir/client/openssl.cnf" \
-				-extensions x509_exts
-		cp "$dir/ca/cert.pem" "$dir/client/ca.pem"
-		openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem"
-	fi
-}
-
-# no arguments passed
-# or first arg is `-f` or `--some-option`
-if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
-	# set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless)
-	uid="$(id -u)"
-	if [ "$uid" = '0' ]; then
-		dockerSocket='unix:///var/run/docker.sock'
-	else
-		# if we're not root, we must be trying to run rootless
-		: "${XDG_RUNTIME_DIR:=/run/user/$uid}"
-		dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock"
-	fi
-	case "${DOCKER_HOST:-}" in
-		unix://*)
-			dockerSocket="$DOCKER_HOST"
-			;;
-	esac
-
-	# add our default arguments
-	if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \
-		&& _tls_generate_certs "$DOCKER_TLS_CERTDIR" \
-		&& [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \
-		&& [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \
-		&& [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \
-	; then
-		# generate certs and use TLS if requested/possible (default in 19.03+)
-		set -- dockerd \
-			--host="$dockerSocket" \
-			--host=tcp://0.0.0.0:6789 \
-			--tlsverify \
-			--tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \
-			--tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \
-			--tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \
-			"$@"
-		DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:6789:6789/tcp"
-	else
-		# TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs
-		set -- dockerd \
-			--host="$dockerSocket" \
-			--host=tcp://0.0.0.0:6788 \
-			"$@"
-		DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:6788:6788/tcp"
-	fi
-fi
-
-if [ "$1" = 'dockerd' ]; then
-	# explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file)
-	find /run /var/run -iname 'docker*.pid' -delete || :
-
-	uid="$(id -u)"
-	if [ "$uid" != '0' ]; then
-		# if we're not root, we must be trying to run rootless
-		if ! command -v rootlesskit > /dev/null; then
-			echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)"
-			exit 1
-		fi
-		user="$(id -un 2>/dev/null || :)"
-		if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then
-			echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid"
-			exit 1
-		fi
-		: "${XDG_RUNTIME_DIR:=/run/user/$uid}"
-		export XDG_RUNTIME_DIR
-		if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then
-			echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid"
-			exit 1
-		fi
-		if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then
-			echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1"
-			exit 1
-		fi
-		if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then
-			echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value"
-			exit 1
-		fi
-		# TODO overlay support detection?
-		exec rootlesskit \
-			--net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \
-			--mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \
-			--disable-host-loopback \
-			--port-driver=builtin \
-			--copy-up=/etc \
-			--copy-up=/run \
-			${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \
-			"$@"
-	elif [ -x '/usr/local/bin/dind' ]; then
-		# if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it
-		set -- '/usr/local/bin/dind' "$@"
-	fi
-else
-	# if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too
-	set -- docker-entrypoint.sh "$@"
-fi
-
-exec "$@"

ephemeralJob.yaml

@@ -1,48 +0,0 @@
-apiVersion: batch.github.actions/v1
-kind: CronJob
-metadata:
-    name: cronjob-sample
-spec:
-  schedule: "*/1 * * * *"
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          hostNetwork: true
-          containers:
-          - name: k8srunner
-            image: huangtingluo/autoscale-runner:v0.0
-            imagePullPolicy: Always
-            env:
-              - name: GITHUB_PAT
-                value: 62c13e14e947958516c103a9584f66227697c447
-              - name: GITHUB_RUNNER_SCOPE
-                value: monalisa/main123
-          restartPolicy: Never
-        # spec:
-        #   containers:
-        #   - name: hello
-        #     image: busybox
-        #     args:
-        #     - /bin/sh
-        #     - -c
-        #     - date; echo Hello from the Kubernetes cluster
-        #   restartPolicy: Never
-  # jobTemplate:
-  #   spec:
-  #     template:
-  #       spec:
-  #         hostNetwork: true
-  #         containers:
-  #         - name: k8srunner
-  #           image: huangtingluo/autoscale-runner:v0.0
-  #           imagePullPolicy: Always
-  #           env:
-  #             - name: GITHUB_PAT
-  #               value: 62c13e14e947958516c103a9584f66227697c447
-  #             - name: GITHUB_RUNNER_SCOPE
-  #               value: monalisa/main123
-  #         restartPolicy: Never
-  #     backoffLimit: 1
-  #     completions: 0
-  #     parallelism: 3

hpa-v2.yaml

@@ -1,56 +0,0 @@
-apiVersion: v1
-items:
-- apiVersion: autoscaling/v2beta2
-  kind: HorizontalPodAutoscaler
-  metadata:
-    creationTimestamp: "2020-08-05T19:14:04Z"
-    name: runner-deployment
-    namespace: default
-    resourceVersion: "167447"
-    selfLink: /apis/autoscaling/v2beta2/namespaces/default/horizontalpodautoscalers/runner-deployment
-    uid: 54d86943-eca9-468c-9698-c843f6b6183a
-  spec:
-    maxReplicas: 10
-    metrics:
-    - type: Object
-      object:
-        metric:
-          name: test-metric
-        describedObject:
-          apiVersion: v1
-          kind: Service
-          name: kubernetes
-        target:
-          type: Value
-          value: 300m
-    - resource:
-        name: cpu
-        target:
-          averageUtilization: 50
-          type: Utilization
-      type: Resource
-    minReplicas: 1
-    scaleTargetRef:
-      apiVersion: apps/v1
-      kind: Deployment
-      name: runner-deployment
-  status:
-    conditions:
-    - lastTransitionTime: "2020-08-05T19:14:19Z"
-      message: the HPA controller was able to get the target's current scale
-      reason: SucceededGetScale
-      status: "True"
-      type: AbleToScale
-    - lastTransitionTime: "2020-08-05T19:14:19Z"
-      message: 'the HPA was unable to compute the replica count: unable to get metrics
-        for resource cpu: no metrics returned from resource metrics API'
-      reason: FailedGetResourceMetric
-      status: "False"
-      type: ScalingActive
-    currentMetrics: null
-    currentReplicas: 1
-    desiredReplicas: 0
-kind: List
-metadata:
-  resourceVersion: ""
-  selfLink: ""

job.yaml

@@ -1,92 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: pod-admin
-  namespace: default
-rules:
-- apiGroups: [ "" ]
-  resources: [ "pods", "pods/ephemeralcontainers", "pods/log", "pods/attach", "pods/exec"]
-  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: default-pod-admin
-  namespace: default
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: pod-admin
-subjects:
-- kind: ServiceAccount
-  name: default
-  namespace: default
-
----
-
-apiVersion: batch/v1
-kind: Job
-metadata:
-    namespace: default
-    name: actions-runners
-spec:
-  template:
-    spec:
-      # hostNetwork: true
-      volumes:
-      - name: docker-storage
-        emptyDir: {}
-      - name: runner-working
-        emptyDir: {}
-      containers:
-      - name: docker-host
-        image: docker:18.05-dind
-        imagePullPolicy: Always
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - name: docker-storage
-          mountPath: /var/lib/docker
-        - mountPath: /actions-runner/_work
-          name: runner-working
-      - name: k8srunner
-        image: huangtingluo/autoscale-runner:v0.0
-        volumeMounts:
-          - mountPath: /actions-runner/_work
-            name: runner-working
-        imagePullPolicy: Always
-        env:
-          - name: GITHUB_PAT
-            value: 62c13e14e947958516c103a9584f66227697c447
-          - name: GITHUB_RUNNER_SCOPE
-            value: monalisa/main123
-          - name: K8S_HOST_IP
-            value: "192.168.120.1"
-          - name: DOCKER_HOST
-            value: tcp://localhost:2375
-          - name: K8S_NODE_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: spec.nodeName
-          - name: K8S_POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          - name: K8S_POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-          - name: K8S_POD_IP
-            valueFrom:
-              fieldRef:
-                fieldPath: status.podIP
-          - name: K8S_POD_SERVICE_ACCOUNT
-            valueFrom:
-              fieldRef:
-                fieldPath: spec.serviceAccountName
-      restartPolicy: Never
-  backoffLimit: 1
-  completions: 20
-  parallelism: 3

prereq.yaml

@@ -1,34 +0,0 @@
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  namespace: default
-  name: pod-patcher
-rules:
-- apiGroups: [""] # "" indicates the core API group
-  resources: ["pods"]
-  verbs: ["get", "watch", "list", "patch"]
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: default-pod-patcher
-  namespace: default
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: pod-patcher
-subjects:
-- kind: ServiceAccount
-  name: default
-  namespace: default
-
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: githubtoken
-type: Opaque
-stringData:
-  GITHUB_PAT: "xxx"

runner.yaml

@@ -1,12 +0,0 @@
-apiVersion: actions.github.com/v1alpha1
-kind: Runner
-metadata:
-  name: auto-scale-runners
-spec:
-  organization: monalisa
-  group: default
-  repository: main123
-  githubAdminToken: 62c13e14e947958516c103a9584f66227697c447
-  env:
-    - name: K8S_HOST_IP
-      value: "192.168.120.1"

runners.yaml

@@ -1,46 +0,0 @@
-apiVersion: actions.github.com/v1alpha1
-kind: AutoScaleRunner
-metadata:
-  name: auto-scale-runners
-spec:
-  minReplicas: 1
-  maxReplicas: 5
-  configURL: https://github.com/TingluoHuang/example-services
-  githubTokenSecretKeyRef:
-    name: githubtoken
-    key: GITHUB_PAT
-  template:
-    spec:
-      setupDockerInDocker: true
-      imagePullPolicy: Always
-  runnerUpdateHandler:
-    containers:
-    - name: update-image
-      image: huangtingluo/workflow_dispatch:latest
-      imagePullPolicy: Always
-      env:
-        - name: GITHUB_TOKEN
-          valueFrom: 
-            secretKeyRef:
-              name: githubtoken
-              key: GITHUB_PAT
-        - name: GITHUB_OWNER
-          value: tingluohuang
-        - name: GITHUB_REPO
-          value: "workflow_dispatch"
-        - name: GITHUB_EXTRA_CURL_ARG
-          value: "-v"
-        - name: GITHUB_WORKFLOW
-          value: "2539181"
-        - name: GITHUB_WORKFLOW_INPUTS
-          value: "{\"test_input\":\"test\"}"
-    
-        # - name: GITHUB_REPO
-        #   value: "k8s-runner-image"
-        # - name: GITHUB_EXTRA_CURL_ARG
-        #   value: "-v"
-        # - name: GITHUB_WORKFLOW
-        #   value: "docker-publish.yml"
-        # - name: GITHUB_WORKFLOW_INPUTS
-        #   value: "{\"runnerDownloadUrl\":\"https://github.com/TingluoHuang/runner/releases/download/test/actions-runner-linux-x64-2.299.0.tar.gz\"}"
-    

src/Misc/download-runner.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-set -e
-
-# if the scope has a slash, it's a repo runner
-# orgs_or_repos="orgs"
-# if [[ "$GITHUB_RUNNER_SCOPE" == *\/* ]]; then
-#     orgs_or_repos="repos"
-# fi
-
-#RUNNER_DOWNLOAD_URL=$(curl -s -X GET ${GITHUB_API_URL}/${orgs_or_repos}/${GITHUB_RUNNER_SCOPE}/actions/runners/downloads -H "authorization: token $GITHUB_PAT" -H "accept: application/vnd.github.everest-preview+json" | jq -r '.[]|select(.os=="linux" and .architecture=="x64")|.download_url')
-
-# download actions and unzip it
-#curl -Ls ${RUNNER_DOWNLOAD_URL} | tar xz \
-
-curl -Ls https://github.com/TingluoHuang/runner/releases/download/test/actions-runner-linux-x64-2.299.0.tar.gz | tar xz
-
-# delete the download tar.gz file
-rm -f ${RUNNER_DOWNLOAD_URL##*/}

src/Misc/entrypoint.sh

@@ -1,77 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-function fatal() {
-   echo "error: $1" >&2
-   exit 1
-}
-
-[ -n "${GITHUB_PAT:-""}" ] || fatal "GITHUB_PAT variable must be set"
-[ -n "${RUNNER_CONFIG_URL:-""}" ] || fatal "RUNNER_CONFIG_URL variable must be set"
-[ -n "${RUNNER_NAME:-""}" ] || fatal "RUNNER_NAME variable must be set"
-
-# if [ -n "${RUNNER_NAME}" ]; then
-#     # Use container id to gen unique runner name if name not provide
-#     CONTAINER_ID=$(cat /proc/self/cgroup | head -n 1 | tr '/' '\n' | tail -1 | cut -c1-12)
-#     RUNNER_NAME="actions-runner-${CONTAINER_ID}"
-# fi
-
-# if the scope has a slash, it's a repo runner
-# orgs_or_repos="orgs"
-# if [[ "$GITHUB_RUNNER_SCOPE" == *\/* ]]; then
-#     orgs_or_repos="repos"
-# fi
-
-# RUNNER_REG_URL="${GITHUB_SERVER_URL:=https://github.com}/${GITHUB_RUNNER_SCOPE}"
-
-echo "Runner Name      : ${RUNNER_NAME}"
-echo "Registration URL : ${RUNNER_CONFIG_URL}"
-# echo "GitHub API URL   : ${GITHUB_API_URL:=https://api.github.com}"
-echo "Runner Labels    : ${RUNNER_LABELS:=""}"
-
-# TODO: if api url is not default, validate it ends in /api/v3
-
-RUNNER_LABELS_ARG=""
-if [ -n "${RUNNER_LABELS}" ]; then
-    RUNNER_LABELS_ARG="--labels ${RUNNER_LABELS}"
-fi
-
-RUNNER_GROUP_ARG=""
-if [ -n "${RUNNER_GROUP}" ]; then
-    RUNNER_GROUP_ARG="--runnergroup ${RUNNER_GROUP}"
-fi
-
-# if [ -n "${K8S_HOST_IP}" ]; then
-#     export http_proxy=http://$K8S_HOST_IP:9090
-# fi
-
-# curl -v -s -X POST ${GITHUB_API_URL}/${orgs_or_repos}/${GITHUB_RUNNER_SCOPE}/actions/runners/registration-token -H "authorization: token $GITHUB_PAT" -H "accept: application/vnd.github.everest-preview+json"
-
-# Generate registration token
-# RUNNER_REG_TOKEN=$(curl -s -X POST ${GITHUB_API_URL}/${orgs_or_repos}/${GITHUB_RUNNER_SCOPE}/actions/runners/registration-token -H "authorization: token $GITHUB_PAT" -H "accept: application/vnd.github.everest-preview+json" | jq -r '.token')
-
-# Create the runner and configure it
-./config.sh --unattended --name $RUNNER_NAME --url $RUNNER_CONFIG_URL --pat $GITHUB_PAT $RUNNER_LABELS_ARG $RUNNER_GROUP_ARG --replace --ephemeral
-
-# while (! docker version ); do
-#   # Docker takes a few seconds to initialize
-#   echo "Waiting for Docker to launch..."
-#   sleep 1
-# done
-
-# unset env
-unset RUNNER_CONFIG_URL
-unset GITHUB_PAT
-unset RUNNER_NAME
-unset RUNNER_GROUP
-unset RUNNER_LABELS
-unset RUNNER_LABELS_ARG
-unset RUNNER_GROUP_ARG
-
-# Run it
-./bin/runsvc.sh interactive
-
-# export http_proxy=""
-# dockerdpid=$(kubectl exec $K8S_POD_NAME --container docker-host -- pidof dockerd)
-# kubectl exec $K8S_POD_NAME --container docker-host -- kill -SIGINT $dockerdpid

src/Misc/jobcomplete.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-echo "Test-0"
-set -euo pipefail
-
-echo "Test-1"
-function fatal() {
-   echo "error: $1" >&2
-   exit 1
-}
-
-echo "Test-2"
-[ -n "${K8S_POD_NAME:-""}" ] || fatal "K8S_POD_NAME variable must be set"
-
-echo "Test-3"
-# echo $http_proxy
-# unset http_proxy
-# unset https_proxy
-# export http_proxy=
-# export HTTP_PROXY=
-
-echo "Test-4"
-kubectl annotate pods $K8S_POD_NAME JOBCOMPLETE=$(date +%s) || fatal "Can't annotate job complete"
-
-echo "Test-5"
-exit 0

src/Misc/jobrunning.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-echo "Test-0"
-set -euo pipefail
-
-echo "Test-1"
-function fatal() {
-   echo "error: $1" >&2
-   exit 1
-}
-
-echo "Test-2"
-[ -n "${K8S_POD_NAME:-""}" ] || fatal "K8S_POD_NAME variable must be set"
-
-echo "Test-3"
-# echo $http_proxy
-# unset http_proxy
-# unset https_proxy
-# export http_proxy=
-# export HTTP_PROXY=
-
-echo "Test-4"
-kubectl annotate pods $K8S_POD_NAME JOBRUNNING=$(date +%s) --overwrite || fatal "Can't annotate job running"
-
-echo "Test-5"
-exit 0

src/Misc/jobstart.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-echo "Test-0"
-
-set -euo pipefail
-
-echo "Test-1"
-function fatal() {
-   echo "error: $1" >&2
-   exit 1
-}
-
-echo "Test-2"
-[ -n "${K8S_POD_NAME:-""}" ] || fatal "K8S_POD_NAME variable must be set"
-
-echo "Test-3"
-# echo $http_proxy
-# # unset http_proxy
-# # unset https_proxy
-# export http_proxy=
-# export HTTP_PROXY=
-
-echo "Test-4"
-kubectl -v9 get pod
-
-echo "Test-5"
-echo $K8S_POD_NAME
-timestamp=$(date +%s)
-echo $timestamp
-
-kubectl annotate pods $K8S_POD_NAME JOBSTART=$timestamp
-
-echo "Test-5"

src/Misc/runner_lifecycle.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-EVENT=$1
-TIMESTAMP=$2
-
-echo $EVENT
-echo $TIMESTAMP
-
-function fatal() {
-   echo "error: $1" >&2
-   exit 1
-}
-
-[ -n "${K8S_POD_NAME:-""}" ] || fatal "K8S_POD_NAME variable must be set"
-echo $K8S_POD_NAME
-
-kubectl get pod
-
-kubectl annotate pods $K8S_POD_NAME $EVENT=$TIMESTAMP
-
-echo "DONE"

src/Runner.Common/ConfigurationStore.cs

@@ -33,9 +33,6 @@ namespace GitHub.Runner.Common
         [DataMember(EmitDefaultValue = false)]
         public string PoolName { get; set; }
 
-        [DataMember(EmitDefaultValue = false)]
-        public bool Ephemeral { get; set; }
-
         [DataMember(EmitDefaultValue = false)]
         public string ServerUrl { get; set; }
 

src/Runner.Common/Constants.cs

@@ -90,7 +90,7 @@ namespace GitHub.Runner.Common
                     public static readonly string Labels = "labels";
                     public static readonly string MonitorSocketAddress = "monitorsocketaddress";
                     public static readonly string Name = "name";
-                    public static readonly string Pool = "pool";
+                    public static readonly string RunnerGroup = "runnergroup";
                     public static readonly string StartupType = "startuptype";
                     public static readonly string Url = "url";
                     public static readonly string UserName = "username";
@@ -99,11 +99,9 @@ namespace GitHub.Runner.Common
 
                     // Secret args. Must be added to the "Secrets" getter as well.
                     public static readonly string Token = "token";
-                    public static readonly string PAT = "pat";
                     public static readonly string WindowsLogonPassword = "windowslogonpassword";
                     public static string[] Secrets => new[]
                     {
-                        PAT,
                         Token,
                         WindowsLogonPassword,
                     };
@@ -122,9 +120,9 @@ namespace GitHub.Runner.Common
                 public static class Flags
                 {
                     public static readonly string Commit = "commit";
-                    public static readonly string Ephemeral = "ephemeral";
                     public static readonly string Help = "help";
                     public static readonly string Replace = "replace";
+                    public static readonly string Once = "once";
                     public static readonly string RunAsService = "runasservice";
                     public static readonly string Unattended = "unattended";
                     public static readonly string Version = "version";

src/Runner.Listener/CommandSettings.cs

@@ -28,10 +28,10 @@ namespace GitHub.Runner.Listener
         private readonly string[] validFlags =
         {
             Constants.Runner.CommandLine.Flags.Commit,
-            Constants.Runner.CommandLine.Flags.Ephemeral,
             Constants.Runner.CommandLine.Flags.Help,
             Constants.Runner.CommandLine.Flags.Replace,
             Constants.Runner.CommandLine.Flags.RunAsService,
+            Constants.Runner.CommandLine.Flags.Once,
             Constants.Runner.CommandLine.Flags.Unattended,
             Constants.Runner.CommandLine.Flags.Version
         };
@@ -42,8 +42,7 @@ namespace GitHub.Runner.Listener
             Constants.Runner.CommandLine.Args.Labels,
             Constants.Runner.CommandLine.Args.MonitorSocketAddress,
             Constants.Runner.CommandLine.Args.Name,
-            Constants.Runner.CommandLine.Args.PAT,
+            Constants.Runner.CommandLine.Args.RunnerGroup,
-            Constants.Runner.CommandLine.Args.Pool,
             Constants.Runner.CommandLine.Args.StartupType,
             Constants.Runner.CommandLine.Args.Token,
             Constants.Runner.CommandLine.Args.Url,
@@ -64,7 +63,8 @@ namespace GitHub.Runner.Listener
         public bool Help => TestFlag(Constants.Runner.CommandLine.Flags.Help);
         public bool Unattended => TestFlag(Constants.Runner.CommandLine.Flags.Unattended);
         public bool Version => TestFlag(Constants.Runner.CommandLine.Flags.Version);
-        public bool Ephemeral => TestFlag(Constants.Runner.CommandLine.Flags.Ephemeral);
+
+        public bool RunOnce => TestFlag(Constants.Runner.CommandLine.Flags.Once);
 
         // Constructor.
         public CommandSettings(IHostContext context, string[] args)
@@ -169,6 +169,15 @@ namespace GitHub.Runner.Listener
                 validator: Validators.NonEmptyValidator);
         }
 
+        public string GetRunnerGroupName(string defaultPoolName = null)
+        {
+            return GetArgOrPrompt(
+                name: Constants.Runner.CommandLine.Args.RunnerGroup,
+                description: "Enter the name of the runner group to add this runner to:",
+                defaultValue: defaultPoolName ?? "default",
+                validator: Validators.NonEmptyValidator);
+        }
+
         public string GetToken()
         {
             return GetArgOrPrompt(
@@ -178,11 +187,6 @@ namespace GitHub.Runner.Listener
                 validator: Validators.NonEmptyValidator);
         }
 
-        public string GetGitHubPersonalAccessToken()
-        {
-            return GetArg(name: Constants.Runner.CommandLine.Args.PAT);
-        }
-
         public string GetRunnerRegisterToken()
         {
             return GetArgOrPrompt(

src/Runner.Listener/Configuration/ConfigurationManager.cs

@@ -7,13 +7,11 @@ using GitHub.Services.OAuth;
 using GitHub.Services.WebApi;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace GitHub.Runner.Listener.Configuration
@@ -109,21 +107,8 @@ namespace GitHub.Runner.Listener.Configuration
                 else
                 {
                     runnerSettings.GitHubUrl = inputUrl;
-                    var githubPAT = command.GetGitHubPersonalAccessToken();
+                    var githubToken = command.GetRunnerRegisterToken();
-                    var registerToken = string.Empty;
+                    GitHubAuthResult authResult = await GetTenantCredential(inputUrl, githubToken, Constants.RunnerEvent.Register);
-                    if (!string.IsNullOrEmpty(githubPAT))
-                    {
-                        Trace.Info("Retriving runner register token using GitHub PAT.");
-                        var jitToken = await GetJITRunnerTokenAsync(inputUrl, githubPAT, "registration");
-                        Trace.Info($"Retrived runner register token is good to {jitToken.ExpiresAt}.");
-                        HostContext.SecretMasker.AddValue(jitToken.Token);
-                        registerToken = jitToken.Token;
-                    }
-                    if (string.IsNullOrEmpty(registerToken))
-                    {
-                        registerToken = command.GetRunnerRegisterToken();
-                    }
-                    GitHubAuthResult authResult = await GetTenantCredential(inputUrl, registerToken, Constants.RunnerEvent.Register);
                     runnerSettings.ServerUrl = authResult.TenantUrl;
                     creds = authResult.ToVssCredentials();
                     Trace.Info("cred retrieved via GitHub auth");
@@ -174,17 +159,34 @@ namespace GitHub.Runner.Listener.Configuration
 
             _term.WriteSection("Runner Registration");
 
-            //Get all the agent pools, and select the first private pool
+            // If we have more than one runner group available, allow the user to specify which one to be added into
+            string poolName = null;
+            TaskAgentPool agentPool = null;
             List<TaskAgentPool> agentPools = await _runnerServer.GetAgentPoolsAsync();
-            TaskAgentPool agentPool = agentPools?.Where(x => x.IsHosted == false).FirstOrDefault();
+            TaskAgentPool defaultPool = agentPools?.Where(x => x.IsInternal).FirstOrDefault();
 
-            if (agentPool == null)
+            if (agentPools?.Where(x => !x.IsHosted).Count() > 1)
             {
-                throw new TaskAgentPoolNotFoundException($"Could not find any private pool. Contact support.");
+                poolName = command.GetRunnerGroupName(defaultPool?.Name);
+                _term.WriteLine();
+                agentPool = agentPools.Where(x => string.Equals(poolName, x.Name, StringComparison.OrdinalIgnoreCase) && !x.IsHosted).FirstOrDefault();
             }
             else
             {
-                Trace.Info("Found a private pool with id {1} and name {2}", agentPool.Id, agentPool.Name);
+                agentPool = defaultPool;
+            }
+
+            if (agentPool == null && poolName == null)
+            {
+                throw new TaskAgentPoolNotFoundException($"Could not find any self-hosted runner groups. Contact support.");
+            }
+            else if (agentPool == null && poolName != null)
+            {
+                throw new TaskAgentPoolNotFoundException($"Could not find any self-hosted runner group named \"{poolName}\".");
+            }
+            else
+            {
+                Trace.Info("Found a self-hosted runner group with id {1} and name {2}", agentPool.Id, agentPool.Name);
                 runnerSettings.PoolId = agentPool.Id;
                 runnerSettings.PoolName = agentPool.Name;
             }
@@ -192,7 +194,6 @@ namespace GitHub.Runner.Listener.Configuration
             TaskAgent agent;
             while (true)
             {
-                runnerSettings.Ephemeral = command.Ephemeral;
                 runnerSettings.AgentName = command.GetRunnerName();
 
                 _term.WriteLine();
@@ -209,7 +210,7 @@ namespace GitHub.Runner.Listener.Configuration
                     if (command.GetReplace())
                     {
                         // Update existing agent with new PublicKey, agent version.
-                        agent = UpdateExistingAgent(agent, publicKey, userLabels, runnerSettings.Ephemeral);
+                        agent = UpdateExistingAgent(agent, publicKey, userLabels);
 
                         try
                         {
@@ -232,7 +233,7 @@ namespace GitHub.Runner.Listener.Configuration
                 else
                 {
                     // Create a new agent.
-                    agent = CreateNewAgent(runnerSettings.AgentName, publicKey, userLabels, runnerSettings.Ephemeral);
+                    agent = CreateNewAgent(runnerSettings.AgentName, publicKey, userLabels);
 
                     try
                     {
@@ -372,22 +373,8 @@ namespace GitHub.Runner.Listener.Configuration
                     }
                     else
                     {
-                        var githubPAT = command.GetGitHubPersonalAccessToken();
+                        var githubToken = command.GetRunnerDeletionToken();
-                        var deletionToken = string.Empty;
+                        GitHubAuthResult authResult = await GetTenantCredential(settings.GitHubUrl, githubToken, Constants.RunnerEvent.Remove);
-                        if (!string.IsNullOrEmpty(githubPAT))
-                        {
-                            Trace.Info("Retriving runner deletion token using GitHub PAT.");
-                            var jitToken = await GetJITRunnerTokenAsync(settings.GitHubUrl, githubPAT, "remove");
-                            Trace.Info($"Retrived runner deletion token is good to {jitToken.ExpiresAt}.");
-                            HostContext.SecretMasker.AddValue(jitToken.Token);
-                            deletionToken = jitToken.Token;
-                        }
-                        if (string.IsNullOrEmpty(deletionToken))
-                        {
-                            deletionToken = command.GetRunnerDeletionToken();
-                        }
-
-                        GitHubAuthResult authResult = await GetTenantCredential(settings.GitHubUrl, deletionToken, Constants.RunnerEvent.Remove);
                         creds = authResult.ToVssCredentials();
                         Trace.Info("cred retrieved via GitHub auth");
                     }
@@ -470,7 +457,7 @@ namespace GitHub.Runner.Listener.Configuration
         }
 
 
-        private TaskAgent UpdateExistingAgent(TaskAgent agent, RSAParameters publicKey, ISet<string> userLabels, bool ephemeral)
+        private TaskAgent UpdateExistingAgent(TaskAgent agent, RSAParameters publicKey, ISet<string> userLabels)
         {
             ArgUtil.NotNull(agent, nameof(agent));
             agent.Authorization = new TaskAgentAuthorization
@@ -481,8 +468,6 @@ namespace GitHub.Runner.Listener.Configuration
             // update should replace the existing labels
             agent.Version = BuildConstants.RunnerPackage.Version;
             agent.OSDescription = RuntimeInformation.OSDescription;
-            agent.Ephemeral = ephemeral;
-            agent.MaxParallelism = 1;
 
             agent.Labels.Clear();
 
@@ -498,7 +483,7 @@ namespace GitHub.Runner.Listener.Configuration
             return agent;
         }
 
-        private TaskAgent CreateNewAgent(string agentName, RSAParameters publicKey, ISet<string> userLabels, bool ephemeral)
+        private TaskAgent CreateNewAgent(string agentName, RSAParameters publicKey, ISet<string> userLabels)
         {
             TaskAgent agent = new TaskAgent(agentName)
             {
@@ -509,7 +494,6 @@ namespace GitHub.Runner.Listener.Configuration
                 MaxParallelism = 1,
                 Version = BuildConstants.RunnerPackage.Version,
                 OSDescription = RuntimeInformation.OSDescription,
-                Ephemeral = ephemeral,
             };
 
             agent.Labels.Add(new AgentLabel("self-hosted", LabelType.System));
@@ -531,72 +515,6 @@ namespace GitHub.Runner.Listener.Configuration
                 string.Equals(gitHubUrl.Host, "github.localhost", StringComparison.OrdinalIgnoreCase);
         }
 
-        private async Task<GitHubRunnerRegisterToken> GetJITRunnerTokenAsync(string githubUrl, string githubToken, string tokenType)
-        {
-            var githubApiUrl = "";
-            var gitHubUrlBuilder = new UriBuilder(githubUrl);
-            var path = gitHubUrlBuilder.Path.Split(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar, StringSplitOptions.RemoveEmptyEntries);
-            if (path.Length == 1)
-            {
-                if (IsHostedServer(gitHubUrlBuilder))
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/orgs/{path[0]}/actions/runners/{tokenType}-token";
-                }
-                else
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/orgs/{path[0]}/actions/runners/{tokenType}-token";
-                }
-            }
-            if (path.Length == 2)
-            {
-                var repoScope = "repos/";
-                if (string.Equals(path[0], "enterprises", StringComparison.OrdinalIgnoreCase))
-                {
-                    repoScope = "";
-                }
-
-                if (IsHostedServer(gitHubUrlBuilder))
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/{repoScope}{path[0]}/{path[1]}/actions/runners/{tokenType}-token";
-                }
-                else
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/{repoScope}{path[0]}/{path[1]}/actions/runners/{tokenType}-token";
-                }
-            }
-            else
-            {
-                throw new ArgumentException($"'{githubUrl}' should point to an org or repository.");
-            }
-
-            using (var httpClientHandler = HostContext.CreateHttpClientHandler())
-            using (var httpClient = new HttpClient(httpClientHandler))
-            {
-                var base64EncodingToken = Convert.ToBase64String(Encoding.UTF8.GetBytes($"github:{githubToken}"));
-                HostContext.SecretMasker.AddValue(base64EncodingToken);
-                httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("basic", base64EncodingToken);
-                httpClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);
-                httpClient.DefaultRequestHeaders.Accept.ParseAdd("application/vnd.github.v3+json");
-
-                var response = await httpClient.PostAsync(githubApiUrl, new StringContent(string.Empty));
-
-                if (response.IsSuccessStatusCode)
-                {
-                    Trace.Info($"Http response code: {response.StatusCode} from 'POST {githubApiUrl}'");
-                    var jsonResponse = await response.Content.ReadAsStringAsync();
-                    return StringUtil.ConvertFromJson<GitHubRunnerRegisterToken>(jsonResponse);
-                }
-                else
-                {
-                    _term.WriteError($"Http response code: {response.StatusCode} from 'POST {githubApiUrl}'");
-                    var errorResponse = await response.Content.ReadAsStringAsync();
-                    _term.WriteError(errorResponse);
-                    response.EnsureSuccessStatusCode();
-                    return null;
-                }
-            }
-        }
-
         private async Task<GitHubAuthResult> GetTenantCredential(string githubUrl, string githubToken, string runnerEvent)
         {
             var githubApiUrl = "";

src/Runner.Listener/Configuration/CredentialManager.cs

@@ -71,16 +71,6 @@ namespace GitHub.Runner.Listener.Configuration
         }
     }
 
-    [DataContract]
-    public sealed class GitHubRunnerRegisterToken
-    {
-        [DataMember(Name = "token")]
-        public string Token { get; set; }
-
-        [DataMember(Name = "expires_at")]
-        public string ExpiresAt { get; set; }
-    }
-
     [DataContract]
     public sealed class GitHubAuthResult
     {

src/Runner.Listener/JobDispatcher.cs

@@ -477,53 +477,6 @@ namespace GitHub.Runner.Listener
                         var systemConnection = message.Resources.Endpoints.SingleOrDefault(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
                         var accessToken = systemConnection?.Authorization?.Parameters["AccessToken"];
                         notification.JobStarted(message.JobId, accessToken, systemConnection.Url);
-                        var jobStartNotification = Environment.GetEnvironmentVariable("_INTERNAL_RUNNER_LIFECYCLE_NOTIFICATION");
-                        if (!string.IsNullOrEmpty(jobStartNotification))
-                        {
-                            term.WriteLine($"{DateTime.UtcNow:u}: Publish JobStart to {jobStartNotification}");
-                            using (var jobStartInvoker = HostContext.CreateService<IProcessInvoker>())
-                            {
-                                jobStartInvoker.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
-                                {
-                                    if (!string.IsNullOrEmpty(stdout.Data))
-                                    {
-                                        Trace.Info($"JobStartNotification: {stdout.Data}");
-                                    }
-                                };
-
-                                jobStartInvoker.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stderr)
-                                {
-                                    if (!string.IsNullOrEmpty(stderr.Data))
-                                    {
-                                        if (!string.IsNullOrEmpty(stderr.Data))
-                                        {
-                                            Trace.Error($"JobStartNotification: {stderr.Data}");
-                                        }
-                                    }
-                                };
-
-                                try
-                                {
-                                    await jobStartInvoker.ExecuteAsync(
-                                        workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Root),
-                                        fileName: WhichUtil.Which("bash"),
-                                        arguments: $"-c \"{jobStartNotification} JOBSTART {DateTime.UtcNow.ToString("O")}\"",
-                                        environment: null,
-                                        requireExitCodeZero: true,
-                                        outputEncoding: null,
-                                        killProcessOnCancel: true,
-                                        redirectStandardIn: null,
-                                        inheritConsoleHandler: false,
-                                        keepStandardInOpen: false,
-                                        highPriorityProcess: true,
-                                        cancellationToken: new CancellationTokenSource(10000).Token);
-                                }
-                                catch (Exception ex)
-                                {
-                                    Trace.Error($"Fail to publish JobStart notification: {ex}");
-                                }
-                            }
-                        }
 
                         HostContext.WritePerfCounter($"SentJobToWorker_{requestId.ToString()}");
 
@@ -660,53 +613,6 @@ namespace GitHub.Runner.Listener
                         {
                             // This should be the last thing to run so we don't notify external parties until actually finished
                             await notification.JobCompleted(message.JobId);
-                            var jobCompleteNotification = Environment.GetEnvironmentVariable("_INTERNAL_RUNNER_LIFECYCLE_NOTIFICATION");
-                            if (!string.IsNullOrEmpty(jobCompleteNotification))
-                            {
-                                term.WriteLine($"{DateTime.UtcNow:u}: Publish JobComplete to {jobCompleteNotification}");
-                                using (var jobCompleteInvoker = HostContext.CreateService<IProcessInvoker>())
-                                {
-                                    jobCompleteInvoker.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
-                                    {
-                                        if (!string.IsNullOrEmpty(stdout.Data))
-                                        {
-                                            Trace.Info($"jobCompleteNotification: {stdout.Data}");
-                                        }
-                                    };
-
-                                    jobCompleteInvoker.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stderr)
-                                    {
-                                        if (!string.IsNullOrEmpty(stderr.Data))
-                                        {
-                                            if (!string.IsNullOrEmpty(stderr.Data))
-                                            {
-                                                Trace.Error($"jobCompleteNotification: {stderr.Data}");
-                                            }
-                                        }
-                                    };
-
-                                    try
-                                    {
-                                        await jobCompleteInvoker.ExecuteAsync(
-                                            workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Root),
-                                            fileName: WhichUtil.Which("bash"),
-                                            arguments: $"-c \"{jobCompleteNotification} JOBCOMPLETE {DateTime.UtcNow.ToString("O")}\"",
-                                            environment: null,
-                                            requireExitCodeZero: true,
-                                            outputEncoding: null,
-                                            killProcessOnCancel: true,
-                                            redirectStandardIn: null,
-                                            inheritConsoleHandler: false,
-                                            keepStandardInOpen: false,
-                                            highPriorityProcess: true,
-                                            cancellationToken: new CancellationTokenSource(10000).Token);
-                                    }
-                                    catch (Exception ex)
-                                    {
-                                        Trace.Error($"Fail to publish JobComplete notification: {ex}");
-                                    }
-                                }
-                            }
                         }
                     }
                 }
@@ -739,56 +645,7 @@ namespace GitHub.Runner.Listener
                         // fire first renew succeed event.
                         firstJobRequestRenewed.TrySetResult(0);
                     }
-                    else
-                    {
-                        var jobRunningNotification = Environment.GetEnvironmentVariable("_INTERNAL_RUNNER_LIFECYCLE_NOTIFICATION");
-                        if (!string.IsNullOrEmpty(jobRunningNotification))
-                        {
-                            HostContext.GetService<ITerminal>().WriteLine($"{DateTime.UtcNow:u}: Publish JobRunning to {jobRunningNotification}");
-                            using (var jobRunningInvoker = HostContext.CreateService<IProcessInvoker>())
-                            {
-                                jobRunningInvoker.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
-                                {
-                                    if (!string.IsNullOrEmpty(stdout.Data))
-                                    {
-                                        Trace.Info($"JobRunningNotification: {stdout.Data}");
-                                    }
-                                };
 
-                                jobRunningInvoker.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stderr)
-                                {
-                                    if (!string.IsNullOrEmpty(stderr.Data))
-                                    {
-                                        if (!string.IsNullOrEmpty(stderr.Data))
-                                        {
-                                            Trace.Error($"JobRunningNotification: {stderr.Data}");
-                                        }
-                                    }
-                                };
-
-                                try
-                                {
-                                    await jobRunningInvoker.ExecuteAsync(
-                                        workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Root),
-                                        fileName: WhichUtil.Which("bash"),
-                                        arguments: $"-c \"{jobRunningNotification} JOBRUNNING {DateTime.UtcNow.ToString("O")}\"",
-                                        environment: null,
-                                        requireExitCodeZero: true,
-                                        outputEncoding: null,
-                                        killProcessOnCancel: true,
-                                        redirectStandardIn: null,
-                                        inheritConsoleHandler: false,
-                                        keepStandardInOpen: false,
-                                        highPriorityProcess: true,
-                                        cancellationToken: new CancellationTokenSource(10000).Token);
-                                }
-                                catch (Exception ex)
-                                {
-                                    Trace.Error($"Fail to publish JobRunning notification: {ex}");
-                                }
-                            }
-                        }
-                    }
                     if (encounteringError > 0)
                     {
                         encounteringError = 0;

src/Runner.Listener/Runner.cs

@@ -193,7 +193,7 @@ namespace GitHub.Runner.Listener
                     HostContext.StartupType = startType;
 
                     // Run the runner interactively or as service
-                    return await RunAsync(settings, settings.Ephemeral);
+                    return await RunAsync(settings, command.RunOnce);
                 }
                 else
                 {
@@ -474,7 +474,7 @@ Config Options:
     _term.WriteLine($@" --windowslogonaccount string   Account to run the service as. Requires runasservice");
     _term.WriteLine($@" --windowslogonpassword string  Password for the service account. Requires runasservice");
 #endif
-            _term.WriteLine($@"
+    _term.WriteLine($@"
 Examples:
  Configure a runner non-interactively:
   .{separator}config.{ext} --unattended --url <url> --token <token>

src/Runner.Listener/SelfUpdater.cs

@@ -59,53 +59,6 @@ namespace GitHub.Runner.Listener
 
                 Trace.Info($"An update is available.");
 
-                var runnerUpdateNotification = Environment.GetEnvironmentVariable("_INTERNAL_RUNNER_LIFECYCLE_NOTIFICATION");
-                if (!string.IsNullOrEmpty(runnerUpdateNotification))
-                {
-                    HostContext.GetService<ITerminal>().WriteLine($"{DateTime.UtcNow:u}: Publish RunnerUpdate to {runnerUpdateNotification}");
-                    using (var runnerUpdateInvoker = HostContext.CreateService<IProcessInvoker>())
-                    {
-                        runnerUpdateInvoker.OutputDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stdout)
-                        {
-                            if (!string.IsNullOrEmpty(stdout.Data))
-                            {
-                                Trace.Info($"RunnerUpdateNotification: {stdout.Data}");
-                            }
-                        };
-
-                        runnerUpdateInvoker.ErrorDataReceived += delegate (object sender, ProcessDataReceivedEventArgs stderr)
-                        {
-                            if (!string.IsNullOrEmpty(stderr.Data))
-                            {
-                                if (!string.IsNullOrEmpty(stderr.Data))
-                                {
-                                    Trace.Error($"RunnerUpdateNotification: {stderr.Data}");
-                                }
-                            }
-                        };
-
-                        try
-                        {
-                            await runnerUpdateInvoker.ExecuteAsync(
-                                workingDirectory: HostContext.GetDirectory(WellKnownDirectory.Root),
-                                fileName: WhichUtil.Which("bash"),
-                                arguments: $"-c \"{runnerUpdateNotification} RUNNERUPDATE {DateTime.UtcNow.ToString("O")}\"",
-                                environment: null,
-                                requireExitCodeZero: true,
-                                outputEncoding: null,
-                                killProcessOnCancel: true,
-                                redirectStandardIn: null,
-                                inheritConsoleHandler: false,
-                                keepStandardInOpen: false,
-                                highPriorityProcess: true,
-                                cancellationToken: new CancellationTokenSource(10000).Token);
-                        }
-                        catch (Exception ex)
-                        {
-                            Trace.Error($"Fail to publish RunnerUpdate notification: {ex}");
-                        }
-                    }
-                }
                 // Print console line that warn user not shutdown runner.
                 await UpdateRunnerUpdateStateAsync("Runner update in progress, do not shutdown runner.");
                 await UpdateRunnerUpdateStateAsync($"Downloading {_targetPackage.Version} runner");

src/Runner.Worker/ActionManager.cs

@@ -395,7 +395,7 @@ namespace GitHub.Runner.Worker
                             Trace.Info($"Action cleanup plugin: {plugin.PluginTypeName}.");
                         }
                     }
-                    else if (definition.Data.Execution.ExecutionType == ActionExecutionType.Composite && !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TESTING_COMPOSITE_ACTIONS_ALPHA")))
+                    else if (definition.Data.Execution.ExecutionType == ActionExecutionType.Composite)
                     {
                         var compositeAction = definition.Data.Execution as CompositeActionExecutionData;
                         Trace.Info($"Load {compositeAction.Steps?.Count ?? 0} action steps.");
@@ -1048,7 +1048,7 @@ namespace GitHub.Runner.Worker
                     Trace.Info($"Action plugin: {(actionDefinitionData.Execution as PluginActionExecutionData).Plugin}, no more preparation.");
                     return null;
                 }
-                else if (actionDefinitionData.Execution.ExecutionType == ActionExecutionType.Composite && !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TESTING_COMPOSITE_ACTIONS_ALPHA")))
+                else if (actionDefinitionData.Execution.ExecutionType == ActionExecutionType.Composite)
                 {
                     Trace.Info($"Action composite: {(actionDefinitionData.Execution as CompositeActionExecutionData).Steps}, no more preparation.");
                     return null;

src/Runner.Worker/ActionManifestManager.cs

@@ -105,12 +105,7 @@ namespace GitHub.Runner.Worker
                             break;
 
                         case "outputs":
-                            if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TESTING_COMPOSITE_ACTIONS_ALPHA")))
+                            actionOutputs = actionPair.Value.AssertMapping("outputs");
-                            {
-                                actionOutputs = actionPair.Value.AssertMapping("outputs");
-                                break;
-                            }
-                            Trace.Info($"Ignore action property outputs. Outputs for a whole action is not supported yet.");
                             break;
 
                         case "description":
@@ -423,14 +418,10 @@ namespace GitHub.Runner.Worker
                         preIfToken = run.Value.AssertString("pre-if");
                         break;
                     case "steps":
-                        if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TESTING_COMPOSITE_ACTIONS_ALPHA")))
+                        var stepsToken = run.Value.AssertSequence("steps");
-                        {
+                        steps = PipelineTemplateConverter.ConvertToSteps(templateContext, stepsToken);
-                            var stepsToken = run.Value.AssertSequence("steps");
+                        templateContext.Errors.Check();
-                            steps = PipelineTemplateConverter.ConvertToSteps(templateContext, stepsToken);
+                        break;
-                            templateContext.Errors.Check();
-                            break;
-                        }
-                        throw new Exception("You aren't supposed to be using Composite Actions yet!");
                     default:
                         Trace.Info($"Ignore run property {runsKey}.");
                         break;
@@ -478,7 +469,7 @@ namespace GitHub.Runner.Worker
                         };
                     }
                 }
-                else if (string.Equals(usingToken.Value, "composite", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("TESTING_COMPOSITE_ACTIONS_ALPHA")))
+                else if (string.Equals(usingToken.Value, "composite", StringComparison.OrdinalIgnoreCase))
                 {
                     if (steps == null)
                     {

src/Runner.Worker/ContainerOperationProvider.cs

@@ -140,11 +140,6 @@ namespace GitHub.Runner.Worker
             executionContext.JobContext.Container["network"] = new StringContextData(containerNetwork);
             executionContext.Output("##[endgroup]");
 
-            if (Environment.GetEnvironmentVariable("K8S_POD_NAME") != null)
-            {
-                IOUtil.CopyDirectory(HostContext.GetDirectory(WellKnownDirectory.Externals), Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Work), "__externals_copy"), CancellationToken.None);
-            }
-
             foreach (var container in containers)
             {
                 container.ContainerNetwork = containerNetwork;
@@ -241,14 +236,7 @@ namespace GitHub.Runner.Worker
 #if OS_WINDOWS
                 container.MountVolumes.Add(new MountVolume(HostContext.GetDirectory(WellKnownDirectory.Externals), container.TranslateToContainerPath(HostContext.GetDirectory(WellKnownDirectory.Externals))));
 #else
-                if (Environment.GetEnvironmentVariable("K8S_POD_NAME") != null)
+                container.MountVolumes.Add(new MountVolume(HostContext.GetDirectory(WellKnownDirectory.Externals), container.TranslateToContainerPath(HostContext.GetDirectory(WellKnownDirectory.Externals)), true));
-                {
-                    container.MountVolumes.Add(new MountVolume(Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Work), "__externals_copy"), container.TranslateToContainerPath(HostContext.GetDirectory(WellKnownDirectory.Externals)), true));
-                }
-                else
-                {
-                    container.MountVolumes.Add(new MountVolume(HostContext.GetDirectory(WellKnownDirectory.Externals), container.TranslateToContainerPath(HostContext.GetDirectory(WellKnownDirectory.Externals)), true));
-                }
 #endif
                 container.MountVolumes.Add(new MountVolume(HostContext.GetDirectory(WellKnownDirectory.Temp), container.TranslateToContainerPath(HostContext.GetDirectory(WellKnownDirectory.Temp))));
                 container.MountVolumes.Add(new MountVolume(HostContext.GetDirectory(WellKnownDirectory.Actions), container.TranslateToContainerPath(HostContext.GetDirectory(WellKnownDirectory.Actions))));

src/Runner.Worker/ExecutionContext.cs

@@ -60,12 +60,14 @@ namespace GitHub.Runner.Worker
 
         bool EchoOnActionCommand { get; set; }
 
+        bool InsideComposite { get; }
+
         ExecutionContext Root { get; }
 
         // Initialize
         void InitializeJob(Pipelines.AgentJobRequestMessage message, CancellationToken token);
         void CancelToken();
-        IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, CancellationTokenSource cancellationTokenSource = null);
+        IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, bool insideComposite = false, CancellationTokenSource cancellationTokenSource = null);
 
         // logging
         long Write(string tag, string message);
@@ -152,6 +154,8 @@ namespace GitHub.Runner.Worker
 
         public bool EchoOnActionCommand { get; set; }
 
+        public bool InsideComposite { get; private set; }
+
         public TaskResult? Result
         {
             get
@@ -256,7 +260,7 @@ namespace GitHub.Runner.Worker
             DictionaryContextData inputsData,
             Dictionary<string, string> envData)
         {
-            step.ExecutionContext = Root.CreateChild(_record.Id, step.DisplayName, _record.Id.ToString("N"), scopeName, step.Action.ContextName, logger: _logger, cancellationTokenSource: CancellationTokenSource.CreateLinkedTokenSource(_cancellationTokenSource.Token));
+            step.ExecutionContext = Root.CreateChild(_record.Id, step.DisplayName, _record.Id.ToString("N"), scopeName, step.Action.ContextName, logger: _logger, insideComposite: true, cancellationTokenSource: CancellationTokenSource.CreateLinkedTokenSource(_cancellationTokenSource.Token));
             step.ExecutionContext.ExpressionValues["inputs"] = inputsData;
             step.ExecutionContext.ExpressionValues["steps"] = Global.StepsContext.GetScope(step.ExecutionContext.GetFullyQualifiedContextName());
 
@@ -275,7 +279,7 @@ namespace GitHub.Runner.Worker
             return step;
         }
 
-        public IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, CancellationTokenSource cancellationTokenSource = null)
+        public IExecutionContext CreateChild(Guid recordId, string displayName, string refName, string scopeName, string contextName, Dictionary<string, string> intraActionState = null, int? recordOrder = null, IPagingLogger logger = null, bool insideComposite = false, CancellationTokenSource cancellationTokenSource = null)
         {
             Trace.Entering();
 
@@ -322,6 +326,8 @@ namespace GitHub.Runner.Worker
                 child._logger.Setup(_mainTimelineId, recordId);
             }
 
+            child.InsideComposite = insideComposite;
+
             return child;
         }
 

src/Runner.Worker/GitHubContext.cs

@@ -9,6 +9,7 @@ namespace GitHub.Runner.Worker
         private readonly HashSet<string> _contextEnvWhitelist = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         {
             "action",
+            "action_path",
             "actor",
             "api_url",
             "base_ref",

src/Runner.Worker/Handlers/CompositeActionHandler.cs

@@ -56,6 +56,14 @@ namespace GitHub.Runner.Worker.Handlers
                 childScopeName = $"__{Guid.NewGuid()}";
             }
 
+            // Copy the github context so that we don't modify the original pointer
+            // We can't use PipelineContextData.Clone() since that creates a null pointer exception for copying a GitHubContext
+            var compositeGitHubContext = new GitHubContext();
+            foreach (var pair in githubContext)
+            {
+                compositeGitHubContext[pair.Key] = pair.Value;
+            }
+
             foreach (Pipelines.ActionStep actionStep in actionSteps)
             {
                 var actionRunner = HostContext.CreateService<IActionRunner>();
@@ -64,6 +72,11 @@ namespace GitHub.Runner.Worker.Handlers
                 actionRunner.Condition = actionStep.Condition;
 
                 var step = ExecutionContext.CreateCompositeStep(childScopeName, actionRunner, inputsData, Environment);
+
+                // Set GITHUB_ACTION_PATH
+                step.ExecutionContext.ExpressionValues["github"] = compositeGitHubContext;
+                step.ExecutionContext.SetGitHubContext("action_path", ActionDirectory);
+
                 compositeSteps.Add(step);
             }
 
@@ -176,9 +189,6 @@ namespace GitHub.Runner.Worker.Handlers
 
                 var actionStep = step as IActionRunner;
 
-                // Set GITHUB_ACTION
-                step.ExecutionContext.SetGitHubContext("action", step.ExecutionContext.GetFullyQualifiedContextName());
-
                 try
                 {
                     // Evaluate and merge action's env block to env context
@@ -215,12 +225,6 @@ namespace GitHub.Runner.Worker.Handlers
 
         private async Task RunStepAsync(IStep step)
         {
-            // Try to evaluate the display name
-            if (step is IActionRunner actionRunner && actionRunner.Stage == ActionRunStage.Main)
-            {
-                actionRunner.TryEvaluateDisplayName(step.ExecutionContext.ExpressionValues, step.ExecutionContext);
-            }
-
             // Start the step.
             Trace.Info("Starting the step.");
             step.ExecutionContext.Debug($"Starting: {step.DisplayName}");

src/Runner.Worker/Handlers/NodeScriptActionHandler.cs

@@ -82,10 +82,6 @@ namespace GitHub.Runner.Worker.Handlers
 
             var nodeRuntimeVersion = await StepHost.DetermineNodeRuntimeVersion(ExecutionContext);
             string file = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Externals), nodeRuntimeVersion, "bin", $"node{IOUtil.ExeExtension}");
-            if (System.Environment.GetEnvironmentVariable("K8S_POD_NAME") != null)
-            {
-                file = Path.Combine(Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Work), "__externals_copy"), nodeRuntimeVersion, "bin", $"node{IOUtil.ExeExtension}");
-            }
 
             // Format the arguments passed to node.
             // 1) Wrap the script file path in double quotes.

src/Runner.Worker/Handlers/ScriptHandler.cs

@@ -23,6 +23,19 @@ namespace GitHub.Runner.Worker.Handlers
 
         public override void PrintActionDetails(ActionRunStage stage)
         {
+            // We don't want to display the internal workings if composite (similar/equivalent information can be found in debug)
+            void writeDetails(string message)
+            {
+                if (ExecutionContext.InsideComposite)
+                {
+                    ExecutionContext.Debug(message);
+                }
+                else
+                {
+                    ExecutionContext.Output(message);
+                }
+            }
+
             if (stage == ActionRunStage.Post)
             {
                 throw new NotSupportedException("Script action should not have 'Post' job action.");
@@ -39,7 +52,7 @@ namespace GitHub.Runner.Worker.Handlers
                     firstLine = firstLine.Substring(0, firstNewLine);
                 }
 
-                ExecutionContext.Output($"##[group]Run {firstLine}");
+                writeDetails(ExecutionContext.InsideComposite ? $"Run {firstLine}" : $"##[group]Run {firstLine}");
             }
             else
             {
@@ -50,7 +63,7 @@ namespace GitHub.Runner.Worker.Handlers
             foreach (var line in multiLines)
             {
                 // Bright Cyan color
-                ExecutionContext.Output($"\x1b[36;1m{line}\x1b[0m");
+                writeDetails($"\x1b[36;1m{line}\x1b[0m");
             }
 
             string argFormat;
@@ -109,23 +122,23 @@ namespace GitHub.Runner.Worker.Handlers
 
             if (!string.IsNullOrEmpty(shellCommandPath))
             {
-                ExecutionContext.Output($"shell: {shellCommandPath} {argFormat}");
+                writeDetails($"shell: {shellCommandPath} {argFormat}");
             }
             else
             {
-                ExecutionContext.Output($"shell: {shellCommand} {argFormat}");
+                writeDetails($"shell: {shellCommand} {argFormat}");
             }
 
             if (this.Environment?.Count > 0)
             {
-                ExecutionContext.Output("env:");
+                writeDetails("env:");
                 foreach (var env in this.Environment)
                 {
-                    ExecutionContext.Output($"  {env.Key}: {env.Value}");
+                    writeDetails($"  {env.Key}: {env.Value}");
                 }
             }
 
-            ExecutionContext.Output("##[endgroup]");
+            writeDetails(ExecutionContext.InsideComposite ? "" : "##[endgroup]");
         }
 
         public async Task RunAsync(ActionRunStage stage)

src/Sdk/DTWebApi/WebApi/TaskAgentPoolReference.cs

@@ -29,6 +29,7 @@ namespace GitHub.DistributedTask.WebApi
             this.PoolType = referenceToBeCloned.PoolType;
             this.Size = referenceToBeCloned.Size;
             this.IsLegacy = referenceToBeCloned.IsLegacy;
+            this.IsInternal = referenceToBeCloned.IsInternal;
         }
 
         public TaskAgentPoolReference Clone()
@@ -67,6 +68,16 @@ namespace GitHub.DistributedTask.WebApi
             set;
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether or not this pool is internal and can't be modified by users
+        /// </summary>
+        [DataMember]
+        public bool IsInternal
+        {
+            get;
+            set;
+        }
+
         /// <summary>
         /// Gets or sets the type of the pool
         /// </summary>

src/Sdk/DTWebApi/WebApi/TaskAgentReference.cs

@@ -24,7 +24,6 @@ namespace GitHub.DistributedTask.WebApi
             this.OSDescription = referenceToBeCloned.OSDescription;
             this.ProvisioningState = referenceToBeCloned.ProvisioningState;
             this.AccessPoint = referenceToBeCloned.AccessPoint;
-            this.Ephemeral = referenceToBeCloned.Ephemeral;
 
             if (referenceToBeCloned.m_links != null)
             {
@@ -82,16 +81,6 @@ namespace GitHub.DistributedTask.WebApi
             set;
         }
 
-        /// <summary>
-        /// Signifies that this Agent can only run one job and will be removed by the server after that one job finish.
-        /// </summary>
-        [DataMember]
-        public bool? Ephemeral
-        {
-            get;
-            set;
-        }
-
         /// <summary>
         /// Whether or not the agent is online.
         /// </summary>

src/Test/L0/DotnetsdkDownloadScriptL0.cs

@@ -1,58 +1,58 @@
-// using Xunit;
+using Xunit;
-// using System.IO;
+using System.IO;
-// using System.Net.Http;
+using System.Net.Http;
-// using System.Threading.Tasks;
+using System.Threading.Tasks;
 
-// namespace GitHub.Runner.Common.Tests
+namespace GitHub.Runner.Common.Tests
-// {
+{
-//     public sealed class DotnetsdkDownloadScriptL0
+    public sealed class DotnetsdkDownloadScriptL0
-//     {
+    {
-//         [Fact]
+        [Fact]
-//         [Trait("Level", "L0")]
+        [Trait("Level", "L0")]
-//         [Trait("Category", "Runner")]
+        [Trait("Category", "Runner")]
-//         public async Task EnsureDotnetsdkBashDownloadScriptUpToDate()
+        public async Task EnsureDotnetsdkBashDownloadScriptUpToDate()
-//         {
+        {
-//             string shDownloadUrl = "https://dot.net/v1/dotnet-install.sh";
+            string shDownloadUrl = "https://dot.net/v1/dotnet-install.sh";
 
-//             using (HttpClient downloadClient = new HttpClient())
+            using (HttpClient downloadClient = new HttpClient())
-//             {
+            {
-//                 var response = await downloadClient.GetAsync("https://www.bing.com");
+                var response = await downloadClient.GetAsync("https://www.bing.com");
-//                 if (!response.IsSuccessStatusCode)
+                if (!response.IsSuccessStatusCode)
-//                 {
+                {
-//                     return;
+                    return;
-//                 }
+                }
 
-//                 string shScript = await downloadClient.GetStringAsync(shDownloadUrl);
+                string shScript = await downloadClient.GetStringAsync(shDownloadUrl);
 
-//                 string existingShScript = File.ReadAllText(Path.Combine(TestUtil.GetSrcPath(), "Misc/dotnet-install.sh"));
+                string existingShScript = File.ReadAllText(Path.Combine(TestUtil.GetSrcPath(), "Misc/dotnet-install.sh"));
 
-//                 bool shScriptMatched = string.Equals(shScript.TrimEnd('\n', '\r', '\0').Replace("\r\n", "\n").Replace("\r", "\n"), existingShScript.TrimEnd('\n', '\r', '\0').Replace("\r\n", "\n").Replace("\r", "\n"));
+                bool shScriptMatched = string.Equals(shScript.TrimEnd('\n', '\r', '\0').Replace("\r\n", "\n").Replace("\r", "\n"), existingShScript.TrimEnd('\n', '\r', '\0').Replace("\r\n", "\n").Replace("\r", "\n"));
-//                 Assert.True(shScriptMatched, "Fix the test by updating Src/Misc/dotnet-install.sh with content from https://dot.net/v1/dotnet-install.sh");
+                Assert.True(shScriptMatched, "Fix the test by updating Src/Misc/dotnet-install.sh with content from https://dot.net/v1/dotnet-install.sh");
-//             }
+            }
-//         }
+        }
 
-//         [Fact]
+        [Fact]
-//         [Trait("Level", "L0")]
+        [Trait("Level", "L0")]
-//         [Trait("Category", "Runner")]
+        [Trait("Category", "Runner")]
-//         public async Task EnsureDotnetsdkPowershellDownloadScriptUpToDate()
+        public async Task EnsureDotnetsdkPowershellDownloadScriptUpToDate()
-//         {
+        {
-//             string ps1DownloadUrl = "https://dot.net/v1/dotnet-install.ps1";
+            string ps1DownloadUrl = "https://dot.net/v1/dotnet-install.ps1";
 
-//             using (HttpClient downloadClient = new HttpClient())
+            using (HttpClient downloadClient = new HttpClient())
-//             {
+            {
-//                 var response = await downloadClient.GetAsync("https://www.bing.com");
+                var response = await downloadClient.GetAsync("https://www.bing.com");
-//                 if (!response.IsSuccessStatusCode)
+                if (!response.IsSuccessStatusCode)
-//                 {
+                {
-//                     return;
+                    return;
-//                 }
+                }
 
-//                 string ps1Script = await downloadClient.GetStringAsync(ps1DownloadUrl);
+                string ps1Script = await downloadClient.GetStringAsync(ps1DownloadUrl);
 
-//                 string existingPs1Script = File.ReadAllText(Path.Combine(TestUtil.GetSrcPath(), "Misc/dotnet-install.ps1"));
+                string existingPs1Script = File.ReadAllText(Path.Combine(TestUtil.GetSrcPath(), "Misc/dotnet-install.ps1"));
 
-//                 bool ps1ScriptMatched = string.Equals(ps1Script.TrimEnd('\n', '\r', '\0').Replace("\r\n", "\n").Replace("\r", "\n"), existingPs1Script.TrimEnd('\n', '\r', '\0').Replace("\r\n", "\n").Replace("\r", "\n"));
+                bool ps1ScriptMatched = string.Equals(ps1Script.TrimEnd('\n', '\r', '\0').Replace("\r\n", "\n").Replace("\r", "\n"), existingPs1Script.TrimEnd('\n', '\r', '\0').Replace("\r\n", "\n").Replace("\r", "\n"));
-//                 Assert.True(ps1ScriptMatched, "Fix the test by updating Src/Misc/dotnet-install.ps1 with content from https://dot.net/v1/dotnet-install.ps1");
+                Assert.True(ps1ScriptMatched, "Fix the test by updating Src/Misc/dotnet-install.ps1 with content from https://dot.net/v1/dotnet-install.ps1");
-//             }
+            }
-//         }
+        }
-//     }
+    }
-// }
+}

src/Test/L0/Listener/Configuration/ConfigurationManagerL0.cs

@@ -39,10 +39,12 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
         private string _expectedToken = "expectedToken";
         private string _expectedServerUrl = "https://codedev.ms";
         private string _expectedAgentName = "expectedAgentName";
-        private string _expectedPoolName = "poolName";
+        private string _defaultRunnerGroupName = "defaultRunnerGroup";
+        private string _secondRunnerGroupName = "secondRunnerGroup";
         private string _expectedAuthType = "pat";
         private string _expectedWorkFolder = "_work";
-        private int _expectedPoolId = 1;
+        private int _defaultRunnerGroupId = 1;
+        private int _secondRunnerGroupId = 2;
         private RSACryptoServiceProvider rsa = null;
         private RunnerSettings _configMgrAgentSettings = new RunnerSettings();
 
@@ -97,7 +99,7 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
             _serviceControlManager.Setup(x => x.GenerateScripts(It.IsAny<RunnerSettings>()));
 #endif
 
-            var expectedPools = new List<TaskAgentPool>() { new TaskAgentPool(_expectedPoolName) { Id = _expectedPoolId } };
+            var expectedPools = new List<TaskAgentPool>() { new TaskAgentPool(_defaultRunnerGroupName) { Id = _defaultRunnerGroupId, IsInternal = true }, new TaskAgentPool(_secondRunnerGroupName) { Id = _secondRunnerGroupId } };
             _runnerServer.Setup(x => x.GetAgentPoolsAsync(It.IsAny<string>(), It.IsAny<TaskAgentPoolType>())).Returns(Task.FromResult(expectedPools));
 
             var expectedAgents = new List<TaskAgent>();
@@ -155,7 +157,7 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
                        "configure",                
                        "--url", _expectedServerUrl,
                        "--name", _expectedAgentName,
-                       "--pool", _expectedPoolName,
+                       "--runnergroup", _secondRunnerGroupName,
                        "--work", _expectedWorkFolder,
                        "--auth", _expectedAuthType,
                        "--token", _expectedToken,
@@ -175,7 +177,7 @@ namespace GitHub.Runner.Common.Tests.Listener.Configuration
                 Assert.NotNull(s);
                 Assert.True(s.ServerUrl.Equals(_expectedServerUrl));
                 Assert.True(s.AgentName.Equals(_expectedAgentName));
-                Assert.True(s.PoolId.Equals(_expectedPoolId));
+                Assert.True(s.PoolId.Equals(_secondRunnerGroupId));
                 Assert.True(s.WorkFolder.Equals(_expectedWorkFolder));
 
                 // validate GetAgentPoolsAsync gets called twice with automation pool type

src/Test/L0/Listener/RunnerL0.cs

@@ -243,8 +243,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                 runner.Initialize(hc);
                 var settings = new RunnerSettings
                 {
-                    PoolId = 43242,
+                    PoolId = 43242
-                    Ephemeral = true
                 };
 
                 var message = new TaskAgentMessage()
@@ -295,7 +294,7 @@ namespace GitHub.Runner.Common.Tests.Listener
 
                 _configStore.Setup(x => x.IsServiceConfigured()).Returns(false);
                 //Act
-                var command = new CommandSettings(hc, new string[] { "run" });
+                var command = new CommandSettings(hc, new string[] { "run", "--once" });
                 Task<int> runnerTask = runner.ExecuteCommand(command);
 
                 //Assert
@@ -333,8 +332,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                 runner.Initialize(hc);
                 var settings = new RunnerSettings
                 {
-                    PoolId = 43242,
+                    PoolId = 43242
-                    Ephemeral = true
                 };
 
                 var message1 = new TaskAgentMessage()
@@ -392,7 +390,7 @@ namespace GitHub.Runner.Common.Tests.Listener
 
                 _configStore.Setup(x => x.IsServiceConfigured()).Returns(false);
                 //Act
-                var command = new CommandSettings(hc, new string[] { "run" });
+                var command = new CommandSettings(hc, new string[] { "run", "--once" });
                 Task<int> runnerTask = runner.ExecuteCommand(command);
 
                 //Assert
@@ -433,8 +431,7 @@ namespace GitHub.Runner.Common.Tests.Listener
                 var settings = new RunnerSettings
                 {
                     PoolId = 43242,
-                    AgentId = 5678,
+                    AgentId = 5678
-                    Ephemeral = true
                 };
 
                 var message1 = new TaskAgentMessage()
@@ -478,7 +475,7 @@ namespace GitHub.Runner.Common.Tests.Listener
 
                 _configStore.Setup(x => x.IsServiceConfigured()).Returns(false);
                 //Act
-                var command = new CommandSettings(hc, new string[] { "run" });
+                var command = new CommandSettings(hc, new string[] { "run", "--once" });
                 Task<int> runnerTask = runner.ExecuteCommand(command);
 
                 //Assert

src/runnerversion

@@ -1 +1 @@
-2.299.0
+2.272.0

test_script.sh

@@ -1,6 +0,0 @@
-apt-get update
-apt-get install -y apt-transport-https gnupg2
-curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
-echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list
-apt-get update
-apt-get install -y kubectl