zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: add `$DISK_NAME` to `launch-without-cached-state` (#7709) 

* fix: use `$DISK_NAME` instead of hardcoded value

* fix(ci): tests without cached state were not using $DISK_NAME
This commit is contained in:
Gustavo Valverde 2023-10-10 11:04:21 +01:00 committed by GitHub
parent 00d2b45cb6
commit 59ea5f1693
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/deploy-gcp-tests.yml vendored
View File

@ -193,7 +193,7 @@ jobs:
--command=' \ --command=' \
set -ex; set -ex;
# Extract the correct disk name based on the device-name # Extract the correct disk name based on the device-name
export DISK_NAME=$(ls -l /dev/disk/by-id | grep -oE "google-${{ inputs.test_id }}-${{ env.GITHUB_SHA_SHORT }} -> ../../[^ ]+" | grep -oE "/[^/]+$" | cut -c 2-); \ DISK_NAME=$(ls -l /dev/disk/by-id | grep -oE "google-${{ inputs.test_id }}-${{ env.GITHUB_SHA_SHORT }} -> ../../[^ ]+" | grep -oE "/[^/]+$" | cut -c 2-);
sudo mkfs.ext4 -v /dev/$DISK_NAME \ sudo mkfs.ext4 -v /dev/$DISK_NAME \
' '
@ -208,6 +208,10 @@ jobs:
--ssh-flag="-o ConnectionAttempts=20" \ --ssh-flag="-o ConnectionAttempts=20" \
--ssh-flag="-o ConnectTimeout=5" \ --ssh-flag="-o ConnectTimeout=5" \
--command=' \ --command=' \
set -ex;
# Extract the correct disk name based on the device-name
export DISK_NAME=$(ls -l /dev/disk/by-id | grep -oE "google-${{ inputs.test_id }}-${{ env.GITHUB_SHA_SHORT }} -> ../../[^ ]+" | grep -oE "/[^/]+$" | cut -c 2-); \
sudo docker run \ sudo docker run \
--name ${{ inputs.test_id }} \ --name ${{ inputs.test_id }} \
--tty \ --tty \
@ -229,7 +233,7 @@ jobs:
--ssh-flag="-o ConnectTimeout=5" \ --ssh-flag="-o ConnectTimeout=5" \
--command=' \ --command=' \
lsblk; lsblk;
sudo lsof /dev/sdb; sudo lsof /dev/$DISK_NAME;
sudo dmesg; sudo dmesg;
sudo journalctl -b \ sudo journalctl -b \
' '
@ -405,7 +409,7 @@ jobs:
# SSH into the just created VM, and create a Docker container to run the incoming test # SSH into the just created VM, and create a Docker container to run the incoming test
# from ${{ inputs.test_id }}, then mount the sudo docker volume created in the previous job. # from ${{ inputs.test_id }}, then mount the sudo docker volume created in the previous job.
# #
# The disk mounted in the VM is located at /dev/sdb, we mount the root `/` of this disk to the docker # The disk mounted in the VM is located at /dev/$DISK_NAME, we mount the root `/` of this disk to the docker
# container in one path: # container in one path:
# - /var/cache/zebrad-cache -> ${{ inputs.root_state_path }}/${{ inputs.zebra_state_dir }} -> $ZEBRA_CACHED_STATE_DIR # - /var/cache/zebrad-cache -> ${{ inputs.root_state_path }}/${{ inputs.zebra_state_dir }} -> $ZEBRA_CACHED_STATE_DIR
# #
@ -469,7 +473,7 @@ jobs:
# VM and to the container might require more steps in this workflow, and additional # VM and to the container might require more steps in this workflow, and additional
# considerations. # considerations.
# #
# The disk mounted in the VM is located at /dev/sdb, we want the root `/` of this disk to be # The disk mounted in the VM is located at /dev/$DISK_NAME, we want the root `/` of this disk to be
# available in the docker container at two different paths: # available in the docker container at two different paths:
# - /var/cache/zebrad-cache -> ${{ inputs.root_state_path }}/${{ inputs.zebra_state_dir }} -> $ZEBRA_CACHED_STATE_DIR # - /var/cache/zebrad-cache -> ${{ inputs.root_state_path }}/${{ inputs.zebra_state_dir }} -> $ZEBRA_CACHED_STATE_DIR
# - /var/cache/lwd-cache -> ${{ inputs.root_state_path }}/${{ inputs.lwd_state_dir }} -> $LIGHTWALLETD_DATA_DIR # - /var/cache/lwd-cache -> ${{ inputs.root_state_path }}/${{ inputs.lwd_state_dir }} -> $LIGHTWALLETD_DATA_DIR