From 58aa24bfa5d1da328a9bc15589770ba611928935 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 14 Jul 2017 09:42:28 +0100 Subject: .gitlab-ci.yml: Add test for gitlab deciding not to pass in the var --- .gitlab-ci.yml | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8eff090..ee175a59 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,21 +24,15 @@ before_script: # Private key stored as a protected variable that allows pushing to # ostree@ostree.baserock.org - | - mkdir -p ~/.ssh - echo $baserock_ostree_cache_private_key > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - cat > ~/.ssh/id_rsa.pub << EOF - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDbOQYG8xCjqv+1FptkXQLd6SwNam8zT/PsIQBa+Dgdu0z2Bbd96HUKqmWB/QJv5pp2HaDDIW6Q9bU5PCCu5gfmJhO0/fG7T6Wp0UMElMNxKQCE65gdrN7m3aMJkHwdj26JpRl0YsymgPggD+iQ8mGgNsEjTxuSyFRMYt82SB0fAhFvjIPEQOVqwoqnNj/TOnj3t8xwlSwhyuZXtt+v92KikS/kcNldsHulG6hde9AuK9o1+KfwFDbC6auLnJEO6mOC1FmQRsEROyG0I9gK5N/ngRc9RIRLWEQ9e3Dpgn8sjCGH8gXoskJvtg8MMcIEe1HA0II9IiFMtentHrxvhzasedveSf5IsKMveOcX0w8pB4jjFN+Fy/XP2zGskR9AYVGMMYf1aX5/z9haoK8+/gG5+At7SfP3QtPJdRG9CJxFYuQxbkgyyfzJCkfzf45XnZjdr3UR+yKP5t7zUlnlVEIDK5PvwDu0V5NxN0Irf0Q+SspG2lluBDgOw++xAaUTrGuS3rgAQ/Xlr2s3kesxF5bx1d7Xpv8XuGCiqzIK/2Wk5FGPXZ3iQjdb2FbKxvCO+9bDeEyzj4NG/rALRvj+4PbmSKpITf7VFJoUHd5VccGnugex0cusQXSIuUFwzvVrNAkHl5TcCRHWS+tbvqLPrLmI75fgw1MixfZTr7v8C6guQw== - EOF - # FIXME: we should be able to discover the public key by running this - # command on the private key, and works locally for me with OpenSSH - # 7.4p1-4 on Fedora but it fails on the runner with: - # - # Enter passphrase: Load key "/root/.ssh/id_rsa": incorrect passphrase supplied to decrypt private key - # - # There is no passphrase so this is a weird issue. - # - # ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub + if [ -z "$baserock_ostree_cache_private_key"]; then + echo >&2 "Private key for ostree.baserock.org is not available." + exit 1 + else + mkdir -p ~/.ssh + echo "$baserock_ostree_cache_private_key" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub + fi # Enable push and pull for Baserock artifact cache - | -- cgit v1.2.1