From 1049e34f1411de157be4dbe4bf5492be58a79b41 Mon Sep 17 00:00:00 2001 From: Hugo Herter Date: Thu, 2 May 2024 17:16:08 +0200 Subject: [PATCH] fixup! Fix: Branch `main` could not be tested easily --- .github/workflows/deploy-main-on-staging.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy-main-on-staging.yml b/.github/workflows/deploy-main-on-staging.yml index 46fb3df49..994434295 100644 --- a/.github/workflows/deploy-main-on-staging.yml +++ b/.github/workflows/deploy-main-on-staging.yml @@ -14,19 +14,15 @@ jobs: matrix: staging_servers: - hostname: "ovh.staging.aleph.sh" - host_keys: | # Use `ssh-keyscan -H host` to obtain the host keys - |1|orGVLr9O7BxtBi/Z7x7IUNDCHqQ=|1dGYJsc6Qrz09BDzpdNGPKb3DKM= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDvpJciWglq3BlK1clNRcDNuPxUBxawlNjTIGdUv2j2MZ8+9bUZCJB5iqH+3onG9VIekTPumrlYWlS/fI/K37u8yQrnCrd6/WFoWYbNi2x5lR9Hsi5bEt80P0FArUZZJGsntPuXFxRFGwGxSD53vzeLne8V4eiLkCpc059c6UTpnnW/J7QFyseDCQr0W1l30Mr9gNmKnjAweKYwBKHXhn6TgRwTXOQ7UrBsw6CWt8r67h8BBvPt99ky8yxuL6gnSFXjyhr+5awYScuaUNIKptcbE9jHHxDcQKHstjFYDtl3BV7okPI/QbZnZR05St8/fWh+jy+vmGpSZkErBv6E0tXG08fvGayTW5aUqlQBiK32i6beQj+v27oJTZworwA9RBcT+jiBYTMUAiM2knXW0ijOebX3ZrJHNnPmrdn0SwRetiKG86HgQ+wwkGpwu1VM5y1em5pgETvu9Hx5E1JxBKqrwfGaMUQXVDXo2489mmWg05iAGz6HisSUdDHYQ+8gZp8= - |1|oS92sSDotqSXRoAz1JEKUvD8ULc=|5mHvAIWjnMB7b0rYQBZ4IpihYjA= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFMjvE8AlBf1nJucFehBcIF6DO0tbNuOz8LyBQTt/6FQ0if2YP1ABuN0fauHOtxXLzonoHeaL6ZWBhjHfDex6V8= - |1|LsiOstaTi9lHXJQlX2XCw7CISSY=|i5G9ELrrtzZbE+GbcmauH218mY4= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJuASD1f5wgW3zgwqFjPWc8OF/AgZfHQUkyQ016sS+Fj + host_keys: | # Use `ssh-keyscan -H host | base64 --wrap=0` to obtain the host keys + fDF8b3JHVkxyOU83Qnh0QmkvWjd4N0lVTkRDSHFRPXwxZEdZSnNjNlFyejA5QkR6cGROR1BLYjNES009IHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQmdRRHZwSmNpV2dscTNCbEsxY2xOUmNETnVQeFVCeGF3bE5qVElHZFV2MmoyTVo4KzliVVpDSkI1aXFIKzNvbkc5Vklla1RQdW1ybFlXbFMvZkkvSzM3dTh5UXJuQ3JkNi9XRm9XWWJOaTJ4NWxSOUhzaTViRXQ4MFAwRkFyVVpaSkdzbnRQdVhGeFJGR3dHeFNENTN2emVMbmU4VjRlaUxrQ3BjMDU5YzZVVHBublcvSjdRRnlzZURDUXIwVzFsMzBNcjlnTm1LbmpBd2VLWXdCS0hYaG42VGdSd1RYT1E3VXJCc3c2Q1d0OHI2N2g4QkJ2UHQ5OWt5OHl4dUw2Z25TRlhqeWhyKzVhd1lTY3VhVU5JS3B0Y2JFOWpISHhEY1FLSHN0akZZRHRsM0JWN29rUEkvUWJablpSMDVTdDgvZldoK2p5K3ZtR3BTWmtFckJ2NkUwdFhHMDhmdkdheVRXNWFVcWxRQmlLMzJpNmJlUWordjI3b0pUWndvcndBOVJCY1QramlCWVRNVUFpTTJrblhXMGlqT2ViWDNackpITm5QbXJkbjBTd1JldGlLRzg2SGdRK3d3a0dwd3UxVk01eTFlbTVwZ0VUdnU5SHg1RTFKeEJLcXJ3ZkdhTVVRWFZEWG8yNDg5bW1XZzA1aUFHejZIaXNTVWRESFlRKzhnWnA4PQp8MXxvUzkyc1NEb3RxU1hSb0F6MUpFS1V2RDhVTGM9fDVtSHZBSVdqbk1CN2IwcllRQlo0SXBpaFlqQT0gZWNkc2Etc2hhMi1uaXN0cDI1NiBBQUFBRTJWalpITmhMWE5vWVRJdGJtbHpkSEF5TlRZQUFBQUlibWx6ZEhBeU5UWUFBQUJCQkZNanZFOEFsQmYxbkp1Y0ZlaEJjSUY2RE8wdGJOdU96OEx5QlFUdC82RlEwaWYyWVAxQUJ1TjBmYXVIT3R4WEx6b25vSGVhTDZaV0JoakhmRGV4NlY4PQp8MXxMc2lPc3RhVGk5bEhYSlFsWDJYQ3c3Q0lTU1k9fGk1RzlFTHJydHpaYkUrR2JjbWF1SDIxOG1ZND0gc3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUp1QVNEMWY1d2dXM3pnd3FGalBXYzhPRi9BZ1pmSFFVa3lRMDE2c1MrRmoK os: "debian-12" make_target: "all-podman-debian-12" artifact_name: "aleph-vm.debian-12.deb" - hostname: "hetzner.staging.aleph.sh" - host_keys: | - |1|rq5/ijUdR9RR/2hUJxY6e+WxgYM=|HHkM5wCi0e1tLd/YAvB1fhRx6ZA= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDvpJciWglq3BlK1clNRcDNuPxUBxawlNjTIGdUv2j2MZ8+9bUZCJB5iqH+3onG9VIekTPumrlYWlS/fI/K37u8yQrnCrd6/WFoWYbNi2x5lR9Hsi5bEt80P0FArUZZJGsntPuXFxRFGwGxSD53vzeLne8V4eiLkCpc059c6UTpnnW/J7QFyseDCQr0W1l30Mr9gNmKnjAweKYwBKHXhn6TgRwTXOQ7UrBsw6CWt8r67h8BBvPt99ky8yxuL6gnSFXjyhr+5awYScuaUNIKptcbE9jHHxDcQKHstjFYDtl3BV7okPI/QbZnZR05St8/fWh+jy+vmGpSZkErBv6E0tXG08fvGayTW5aUqlQBiK32i6beQj+v27oJTZworwA9RBcT+jiBYTMUAiM2knXW0ijOebX3ZrJHNnPmrdn0SwRetiKG86HgQ+wwkGpwu1VM5y1em5pgETvu9Hx5E1JxBKqrwfGaMUQXVDXo2489mmWg05iAGz6HisSUdDHYQ+8gZp8= - |1|0NHnYZBjWoH9wGUXB4qD7x/iv68=|OvNcRso1gawWuXoDk567eK9pQ1A= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFMjvE8AlBf1nJucFehBcIF6DO0tbNuOz8LyBQTt/6FQ0if2YP1ABuN0fauHOtxXLzonoHeaL6ZWBhjHfDex6V8= - |1|V0i9hIon1ao2vVMpdCg64IKzWjY=|lQrPhlTT2XAhyuUprAFm+Gu52XI= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJuASD1f5wgW3zgwqFjPWc8OF/AgZfHQUkyQ016sS+Fj + host_keys: | # Use `ssh-keyscan -H host | base64 --wrap=0` to obtain the host keys + fDF8cnE1L2lqVWRSOVJSLzJoVUp4WTZlK1d4Z1lNPXxISGtNNXdDaTBlMXRMZC9ZQXZCMWZoUng2WkE9IHNzaC1yc2EgQUFBQUIzTnphQzF5YzJFQUFBQURBUUFCQUFBQmdRRHZwSmNpV2dscTNCbEsxY2xOUmNETnVQeFVCeGF3bE5qVElHZFV2MmoyTVo4KzliVVpDSkI1aXFIKzNvbkc5Vklla1RQdW1ybFlXbFMvZkkvSzM3dTh5UXJuQ3JkNi9XRm9XWWJOaTJ4NWxSOUhzaTViRXQ4MFAwRkFyVVpaSkdzbnRQdVhGeFJGR3dHeFNENTN2emVMbmU4VjRlaUxrQ3BjMDU5YzZVVHBublcvSjdRRnlzZURDUXIwVzFsMzBNcjlnTm1LbmpBd2VLWXdCS0hYaG42VGdSd1RYT1E3VXJCc3c2Q1d0OHI2N2g4QkJ2UHQ5OWt5OHl4dUw2Z25TRlhqeWhyKzVhd1lTY3VhVU5JS3B0Y2JFOWpISHhEY1FLSHN0akZZRHRsM0JWN29rUEkvUWJablpSMDVTdDgvZldoK2p5K3ZtR3BTWmtFckJ2NkUwdFhHMDhmdkdheVRXNWFVcWxRQmlLMzJpNmJlUWordjI3b0pUWndvcndBOVJCY1QramlCWVRNVUFpTTJrblhXMGlqT2ViWDNackpITm5QbXJkbjBTd1JldGlLRzg2SGdRK3d3a0dwd3UxVk01eTFlbTVwZ0VUdnU5SHg1RTFKeEJLcXJ3ZkdhTVVRWFZEWG8yNDg5bW1XZzA1aUFHejZIaXNTVWRESFlRKzhnWnA4PQp8MXwwTkhuWVpCaldvSDl3R1VYQjRxRDd4L2l2Njg9fE92TmNSc28xZ2F3V3VYb0RrNTY3ZUs5cFExQT0gZWNkc2Etc2hhMi1uaXN0cDI1NiBBQUFBRTJWalpITmhMWE5vWVRJdGJtbHpkSEF5TlRZQUFBQUlibWx6ZEhBeU5UWUFBQUJCQkZNanZFOEFsQmYxbkp1Y0ZlaEJjSUY2RE8wdGJOdU96OEx5QlFUdC82RlEwaWYyWVAxQUJ1TjBmYXVIT3R4WEx6b25vSGVhTDZaV0JoakhmRGV4NlY4PQp8MXxWMGk5aElvbjFhbzJ2Vk1wZENnNjRJS3pXalk9fGxRclBobFRUMlhBaHl1VXByQUZtK0d1NTJYST0gc3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUp1QVNEMWY1d2dXM3pnd3FGalBXYzhPRi9BZ1pmSFFVa3lRMDE2c1MrRmoK os: "debian-12" make_target: "all-podman-debian-12" artifact_name: "aleph-vm.debian-12.deb" @@ -61,7 +57,7 @@ jobs: - name: Install Aleph-VM on the Staging servers run: | - echo ${{ matrix.staging_servers.host_keys }} > ~/.ssh/known_hosts + echo ${{ matrix.staging_servers.host_keys }} | base64 --decode > ~/.ssh/known_hosts # Wait for /var/lib/apt/lists/lock to be unlocked on the remote host via SSH. while ssh root@${SERVER_IPV4} lsof /var/lib/apt/lists/lock; do sleep 1; done @@ -69,5 +65,3 @@ jobs: scp packaging/target/${{ matrix.staging_servers.package_name }} root@${SERVER_IPV4}:/opt ssh root@${SERVER_IPV4} DEBIAN_FRONTEND=noninteractive "apt-get -o DPkg::Lock::Timeout=60 install -y /opt/${{ matrix.staging_servers.package_name }}" - # Allow some time for IPFS Kubo to start - sleep 5