Remove OFS_DIR and chown for cached runners

cloudbase · Oct 14, 2024 · 8b640f4 · 8b640f4
1 parent fff8fc8
commit 8b640f4
Showing 1 changed file with 14 additions and 25 deletions.
diff --git a/cloudconfig/templates.go b/cloudconfig/templates.go
@@ -35,10 +35,8 @@ set -x
 CALLBACK_URL="{{ .CallbackURL }}"
 METADATA_URL="{{ .MetadataURL }}"
 BEARER_TOKEN="{{ .CallbackToken }}"
-{{- if .ExtraContext.OFS_DIR }}
-OFS_DIR_E="{{ .ExtraContext.OFS_DIR }}"
-{{- end }}
-OFS_DIR=${OFS_DIR_E:-"/opt/work"}
+
+RUN_HOME="/home/{{ .RunnerUsername }}/actions-runner"
 
 if [ -z "$METADATA_URL" ];then
 	echo "no token is available and METADATA_URL is not set"
@@ -88,28 +86,19 @@ function downloadAndExtractRunner() {
 	TEMP_TOKEN="Authorization: Bearer {{ .TempDownloadToken }}"
 	fi
 	curl --retry 5 --retry-delay 5 --retry-connrefused --fail -L -H "${TEMP_TOKEN}" -o "/home/{{ .RunnerUsername }}/{{ .FileName }}" "{{ .DownloadURL }}" || fail "failed to download tools"
-	mkdir -p /home/{{ .RunnerUsername }}/actions-runner || fail "failed to create actions-runner folder"
+	mkdir -p "$RUN_HOME" || fail "failed to create actions-runner folder"
 	sendStatus "extracting runner"
-	tar xf "/home/{{ .RunnerUsername }}/{{ .FileName }}" -C /home/{{ .RunnerUsername }}/actions-runner/ || fail "failed to extract runner"
-	# chown {{ .RunnerUsername }}:{{ .RunnerGroup }} -R /home/{{ .RunnerUsername }}/actions-runner/ || fail "failed to change owner"
+	tar xf "/home/{{ .RunnerUsername }}/{{ .FileName }}" -C "$RUN_HOME"/ || fail "failed to extract runner"
+	# chown {{ .RunnerUsername }}:{{ .RunnerGroup }} -R "$RUN_HOME"/ || fail "failed to change owner"
 }
 
-RUN_HOME="/home/{{ .RunnerUsername }}/actions-runner"
-if [! -d "$RUN_HOME" ];then
+if [ ! -d "$RUN_HOME" ];then
 	downloadAndExtractRunner
 	sendStatus "installing dependencies"
 	cd "$RUN_HOME"
 	sudo ./bin/installdependencies.sh || fail "failed to install dependencies"
 else
 	sendStatus "using cached runner found in $RUN_HOME"
-	OFS_AVAIL=1
-	sudo mkdir -p $OFS_DIR/upper-layer $OFS_DIR/work-layer $RUN_HOME
-	sudo chown {{ .RunnerUsername }}:{{ .RunnerGroup }} -R $OFS_DIR/upper-layer $OFS_DIR/work-layer $RUN_HOME $RUN_HOME
-	sudo mount -t overlay overlay -o lowerdir=$RUN_HOME,upperdir=$OFS_DIR/upper-layer,workdir=$OFS_DIR/work-layer $RUN_HOME || OFS_AVAIL=0
-	if [ $OFS_AVAIL -eq 0 ];then
-		sendStatus "falling back to non-overlayfs mode"
-		sudo chown {{ .RunnerUsername }}:{{ .RunnerGroup }} -R "$RUN_HOME" || fail "failed to change owner"
-	fi
 	cd "$RUN_HOME"
 fi
 
@@ -125,13 +114,13 @@ function getRunnerFile() {
 }
 
 sendStatus "downloading JIT credentials"
-getRunnerFile "credentials/runner" "/home/{{ .RunnerUsername }}/actions-runner/.runner" || fail "failed to get runner file"
-getRunnerFile "credentials/credentials" "/home/{{ .RunnerUsername }}/actions-runner/.credentials" || fail "failed to get credentials file"
-getRunnerFile "credentials/credentials_rsaparams" "/home/{{ .RunnerUsername }}/actions-runner/.credentials_rsaparams" || fail "failed to get credentials_rsaparams file"
-getRunnerFile "system/service-name" "/home/{{ .RunnerUsername }}/actions-runner/.service" || fail "failed to get service name file"
-sed -i 's/$/\.service/' /home/{{ .RunnerUsername }}/actions-runner/.service
+getRunnerFile "credentials/runner" ""$RUN_HOME"/.runner" || fail "failed to get runner file"
+getRunnerFile "credentials/credentials" ""$RUN_HOME"/.credentials" || fail "failed to get credentials file"
+getRunnerFile "credentials/credentials_rsaparams" ""$RUN_HOME"/.credentials_rsaparams" || fail "failed to get credentials_rsaparams file"
+getRunnerFile "system/service-name" ""$RUN_HOME"/.service" || fail "failed to get service name file"
+sed -i 's/$/\.service/' "$RUN_HOME"/.service
 
-SVC_NAME=$(cat /home/{{ .RunnerUsername }}/actions-runner/.service)
+SVC_NAME=$(cat "$RUN_HOME"/.service)
 
 sendStatus "generating systemd unit file"
 getRunnerFile "systemd/unit-file?runAsUser={{ .RunnerUsername }}" "$SVC_NAME" || fail "failed to get service file"
@@ -142,7 +131,7 @@ if [ -e "/sys/fs/selinux" ];then
 fi
 
 sendStatus "enabling runner service"
-cp /home/{{ .RunnerUsername }}/actions-runner/bin/runsvc.sh /home/{{ .RunnerUsername }}/actions-runner/ || fail "failed to copy runsvc.sh"
+cp "$RUN_HOME"/bin/runsvc.sh "$RUN_HOME"/ || fail "failed to copy runsvc.sh"
 sudo chown {{ .RunnerUsername }}:{{ .RunnerGroup }} -R /home/{{ .RunnerUsername }} || fail "failed to change owner"
 sudo systemctl daemon-reload || fail "failed to reload systemd"
 sudo systemctl enable $SVC_NAME
@@ -199,7 +188,7 @@ sendStatus "starting service"
 sudo ./svc.sh start || fail "failed to start service"
 
 set +e
-AGENT_ID=$(grep "agentId" /home/{{ .RunnerUsername }}/actions-runner/.runner |  tr -d -c 0-9)
+AGENT_ID=$(grep "agentId" "$RUN_HOME"/.runner |  tr -d -c 0-9)
 if [ $? -ne 0 ];then
 	fail "failed to get agent ID"
 fi