diff --git a/.werft/build.yaml b/.werft/build.yaml index 57b5f01abc0bb7..cbbab32d33a0cc 100644 --- a/.werft/build.yaml +++ b/.werft/build.yaml @@ -228,19 +228,32 @@ pod: sleep 1 set -Eeuo pipefail - sudo chown gitpod:gitpod $GOCACHE export GITHUB_TOKEN=$(echo $GITHUB_TOKEN | xargs) - export DOCKER_HOST=tcp://$NODENAME:2375 - sudo chown -R gitpod:gitpod /workspace - mkdir /workspace/.ssh - cp /mnt/secrets/harvester-vm-ssh-keys/id_rsa /workspace/.ssh/id_rsa_harvester_vm - cp /mnt/secrets/harvester-vm-ssh-keys/id_rsa.pub /workspace/.ssh/id_rsa_harvester_vm.pub - sudo chmod 600 /workspace/.ssh/id_rsa_harvester_vm - sudo chmod 644 /workspace/.ssh/id_rsa_harvester_vm.pub + echo "Job is running on node $NODENAME" | werft log slice "Node information" + + ( \ + sudo chown gitpod:gitpod $GOCACHE && \ + sudo chown -R gitpod:gitpod /workspace && \ + echo "done" \ + ) | werft log slice "chowning /workspace and $GOCACHE" + + ( \ + mkdir -p /workspace/.ssh && \ + cp /mnt/secrets/harvester-vm-ssh-keys/id_rsa /workspace/.ssh/id_rsa_harvester_vm && \ + cp /mnt/secrets/harvester-vm-ssh-keys/id_rsa.pub /workspace/.ssh/id_rsa_harvester_vm.pub && \ + sudo chmod 600 /workspace/.ssh/id_rsa_harvester_vm && \ + sudo chmod 644 /workspace/.ssh/id_rsa_harvester_vm.pub && \ + echo "done" \ + ) | werft log slice "Prepare SSH keys" + + ( \ + cd .werft && \ + yarn install && \ + mv node_modules .. \ + ) | werft log slice "Installing dependencies" - (cd .werft && yarn install && mv node_modules ..) | werft log slice prep printf '{{ toJson . }}' > context.json npx ts-node .werft/build.ts diff --git a/.werft/jobs/build/job-config.ts b/.werft/jobs/build/job-config.ts index a894ffbcc9c8b5..c6a4d87ba051db 100644 --- a/.werft/jobs/build/job-config.ts +++ b/.werft/jobs/build/job-config.ts @@ -150,7 +150,8 @@ export function jobConfig(werft: Werft, context: any): JobConfig { withLargeVM, }; - werft.log("job config", JSON.stringify(jobConfig)); + werft.logOutput(sliceId, JSON.stringify(jobConfig, null, 2)); + werft.log(sliceId, "Expand to see the parsed configuration") const globalAttributes = Object.fromEntries( Object.entries(jobConfig).map((kv) => { const [key, value] = kv;