Skip to content

Commit

Permalink
rename variable, hopefully fixes things
Browse files Browse the repository at this point in the history
  • Loading branch information
aerickson committed Feb 24, 2024
1 parent 724d702 commit feb6b3a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,14 @@ sudo apt-get -y reinstall linux-headers-gcp linux-headers-`uname -r` ${pkg_name}
#

# pre-reqs
apt-get install -y dkms kmod llvm sox libxcb1 nodejs xvfb
apt-get install -y dkms kmod llvm sox libxcb1 nodejs xvfb apt-utils
# v4l2loopback
# - fails for some reason... not sure why (works when run interactively... env vars?)
# - ignore result code
apt-get install -y v4l2loopback-dkms || true
# didn't help:
# - HOSTTYPE=x86_64 SRCARCH=`uname -m`
printenv
apt-get install -y v4l2loopback-dkms v4l2loopback-utils
# see if autoinstall works
dkms autoinstall
# dkms autoinstall
dkms status

# not working: linux-headers
Expand Down
8 changes: 4 additions & 4 deletions scripts/ubuntu-jammy-from-community/05-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ retry docker run hello-world
# removed kvm vmware backdoor

cd /usr/local/bin
retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/generic-worker-multiuser-linux-${ARCH}" > generic-worker
retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/start-worker-linux-${ARCH}" > start-worker
retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/livelog-linux-${ARCH}" > livelog
retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/taskcluster-proxy-linux-${ARCH}" > taskcluster-proxy
retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/generic-worker-multiuser-linux-${TC_ARCH}" > generic-worker
retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/start-worker-linux-${TC_ARCH}" > start-worker
retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/livelog-linux-${TC_ARCH}" > livelog
retry curl -fsSL "https://github.com/taskcluster/taskcluster/releases/download/v${TASKCLUSTER_VERSION}/taskcluster-proxy-linux-${TC_ARCH}" > taskcluster-proxy
chmod a+x generic-worker start-worker taskcluster-proxy livelog

mkdir -p /etc/generic-worker
Expand Down
2 changes: 1 addition & 1 deletion template/vars/ubuntu_amd64.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
env_vars:
# currently only used for taskcluster component installation
ARCH: amd64
TC_ARCH: amd64
2 changes: 1 addition & 1 deletion template/vars/ubuntu_arm64.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
env_vars:
# currently only used for taskcluster component installation
ARCH: arm64
TC_ARCH: arm64

0 comments on commit feb6b3a

Please sign in to comment.