Fix CI

glassechidna · Feb 10, 2018 · 36cd703 · 36cd703
1 parent 7c6c965
commit 36cd703
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/ci/e2e.bash b/ci/e2e.bash
@@ -22,11 +22,12 @@ S3_OBJVER=$(aws s3api head-object --bucket $S3_BUCKET --key $S3_KEY --query Vers
 
 ./dl/sshello &
 sleep 1
-./lastkeypair_linux_amd64 ssh exec --instance-arn abcdef -- -o StrictHostKeyChecking=no -o LogLevel=QUIET -p 2222 travis@localhost | tee out.log
+./lastkeypair_linux_amd64 ssh exec --instance-arn abcdef -- -o StrictHostKeyChecking=no -o LogLevel=QUIET -p 2222 -o HostName=localhost travis@target | tee out.log
 diff out.log ci/expected-output.txt
 
 ./lastkeypair_linux_amd64 ssh exec --instance-arn defghi --dry-run -- -o StrictHostKeyChecking=no -o LogLevel=QUIET -p 2222 | tee out.log
 diff out.log ci/expected-output-jumpbox.txt
+diff ~/.lkp/sshconf ci/expected-output-jumpbox-sshconf.txt
 
 VOUCHER=$(./lastkeypair_linux_amd64 adv vouch --vouchee aidan --context moo)
 ./lastkeypair_linux_amd64 ssh exec --instance-arn defghi --voucher $VOUCHER --dry-run -- -o StrictHostKeyChecking=no -o LogLevel=QUIET -p 2222 travis@localhost | tee out.log

diff --git a/ci/expected-output-jumpbox-sshconf.txt b/ci/expected-output-jumpbox-sshconf.txt
@@ -0,0 +1,17 @@
+IgnoreUnknown CertificateFile
+
+Host jump0
+  HostName 12.34.56.78
+  HostKeyAlias 
+  IdentityFile /home/travis/.lkp/id_rsa
+  CertificateFile /home/travis/.lkp/id_rsa-cert.pub
+  User ec2-user
+
+Host target
+  HostKeyAlias defghi
+  IdentityFile /home/travis/.lkp/id_rsa
+  CertificateFile /home/travis/.lkp/id_rsa-cert.pub
+  User ec2-user
+  HostName 78.65.43.21
+  ProxyJump jump0
+
diff --git a/ci/expected-output-jumpbox.txt b/ci/expected-output-jumpbox.txt
@@ -1 +1 @@
-ssh -o IdentityFile=~/.lkp/id_rsa -o HostKeyAlias=defghi -J [email protected] -W 78.65.43.21:22 -o StrictHostKeyChecking=no -o LogLevel=QUIET -p 2222
+ssh -F /home/travis/.lkp/sshconf -o StrictHostKeyChecking=no -o LogLevel=QUIET -p 2222 target
diff --git a/ci/expected-output-vouched.txt b/ci/expected-output-vouched.txt
@@ -1 +1 @@
-ssh -o IdentityFile=~/.lkp/id_rsa -o HostKeyAlias=defghi -J lkp-travis[email protected] -o StrictHostKeyChecking=no -o LogLevel=QUIET -p 2222 travis@localhost
+ssh -F /home/travis/.lkp/sshconf -o StrictHostKeyChecking=no -o LogLevel=QUIET -p 2222 travis@localhost
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ssh -o IdentityFile=~/.lkp/id_rsa -o HostKeyAlias=defghi -J [email protected] -W 78.65.43.21:22 -o StrictHostKeyChecking=no -o LogLevel=QUIET -p 2222
		ssh -F /home/travis/.lkp/sshconf -o StrictHostKeyChecking=no -o LogLevel=QUIET -p 2222 target