← Back to branch summary

~bowenfan/ols-jenkaas/ols-jenkaas

« back to all changes in this revision

Viewing changes to jobs/project-junit.yaml

Fix ssh config key paths to be user independent

Make them work in snapcraft --use-lxd containers with --bind-ssh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
jobs/project-junit.yaml
79
79
      - wipe-workspace
80
80
      - shell: |
81
81
          cp -a ~/.ssh ~/workspace/.ssh/
82
 
          sed -i 's/\/var\/lib\/jenkins\/.ssh/\/home\/ubuntu\/.ssh/' ~/workspace/.ssh/config
 
82
          sed -i 's#/var/lib/jenkins/.ssh#~/.ssh#' ~/workspace/.ssh/config
83
83
          echo "User otto-copilot" >> ~/workspace/.ssh/config
84
84
          annotate-output ~/jenkaas/project/run-tests {vcs} {trunk} {container} '{setup}' '{landing-tests}' {workdir}
85
85
          rm -rf ~/workspace/.ssh
117
117
      - wipe-workspace
118
118
      - shell: |
119
119
          cp -a ~/.ssh ~/workspace/.ssh/
120
 
          sed -i 's/\/var\/lib\/jenkins\/.ssh/\/home\/ubuntu\/.ssh/' ~/workspace/.ssh/config
 
120
          sed -i 's#/var/lib/jenkins/.ssh#~/.ssh#' ~/workspace/.ssh/config
121
121
          echo "User otto-copilot" >> ~/workspace/.ssh/config
122
122
          annotate-output ~/jenkaas/ols-jenkaas land-approved-{vcs}-proposal {trunk} {workdir} {container} '{setup}' '{landing-tests}'
123
123
          rm -rf ~/workspace/.ssh