diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0a7cb62..11a85bc7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,12 +57,11 @@ jobs: chmod 600 ~/.ssh/dts-ci-key echo -e ${SSH_KEY_GITEA} > ~/.ssh/gitea-key chmod 600 ~/.ssh/gitea-key - cp ~/.ssh/config ~/.ssh/config-old echo -e "\n Host git.3mdeb.com\n HostName git.3mdeb.com\n IdentityFile ~/.ssh/gitea-key\n - IdentitiesOnly yes" >> ~/.ssh/config + IdentitiesOnly yes" >> ~/.ssh/config_deploy - name: Get DTS version id: dts-ver shell: bash @@ -73,7 +72,7 @@ jobs: shell: bash run: | DTS_VER="${{steps.dts-ver.outputs.DTS_VER}}" - ssh -i ~/.ssh/dts-ci-key builder@10.1.40.2 "mkdir -p boot/dts/${DTS_VER}" + ssh -i ~/.ssh/dts-ci-key -F ~/.ssh/config_deploy builder@10.1.40.2 "mkdir -p boot/dts/${DTS_VER}" cd build/tmp/deploy/images/genericx86-64/ cp bzImage bzImage-${DTS_VER} cp dts-base-image-genericx86-64.cpio.gz dts-base-image-${DTS_VER}.cpio.gz @@ -82,10 +81,10 @@ jobs: # do not release iso image until issue is fixed # see: https://github.com/dasharo/dasharo-issues/issues/288 # cp dts-base-image-genericx86-64.iso dts-base-image-${DTS_VER}.iso - scp -i ~/.ssh/dts-ci-key bzImage-${DTS_VER} builder@10.1.40.2:boot/dts/${DTS_VER}/ - scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.cpio.gz builder@10.1.40.2:boot/dts/${DTS_VER}/ - scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.wic.gz builder@10.1.40.2:boot/dts/${DTS_VER}/ - scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.wic.bmap builder@10.1.40.2:boot/dts/${DTS_VER}/ + scp -i ~/.ssh/dts-ci-key -F ~/.ssh/config_deploy bzImage-${DTS_VER} builder@10.1.40.2:boot/dts/${DTS_VER}/ + scp -i ~/.ssh/dts-ci-key -F ~/.ssh/config_deploy dts-base-image-${DTS_VER}.cpio.gz builder@10.1.40.2:boot/dts/${DTS_VER}/ + scp -i ~/.ssh/dts-ci-key -F ~/.ssh/config_deploy dts-base-image-${DTS_VER}.wic.gz builder@10.1.40.2:boot/dts/${DTS_VER}/ + scp -i ~/.ssh/dts-ci-key -F ~/.ssh/config_deploy dts-base-image-${DTS_VER}.wic.bmap builder@10.1.40.2:boot/dts/${DTS_VER}/ # do not release iso image until issue is fixed # see: https://github.com/dasharo/dasharo-issues/issues/288 # scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.iso builder@10.1.40.2:boot/dts/${DTS_VER}/ @@ -101,10 +100,10 @@ jobs: # do not release iso image until issue is fixed # see: https://github.com/dasharo/dasharo-issues/issues/288 # sha256sum dts-base-image-${DTS_VER}.iso > dts-base-image-${DTS_VER}.iso.sha256 - scp -i ~/.ssh/dts-ci-key bzImage-${DTS_VER}.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ - scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.cpio.gz.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ - scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.wic.gz.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ - scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.wic.bmap.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ + scp -i ~/.ssh/dts-ci-key -F ~/.ssh/config_deploy bzImage-${DTS_VER}.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ + scp -i ~/.ssh/dts-ci-key -F ~/.ssh/config_deploy dts-base-image-${DTS_VER}.cpio.gz.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ + scp -i ~/.ssh/dts-ci-key -F ~/.ssh/config_deploy dts-base-image-${DTS_VER}.wic.gz.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ + scp -i ~/.ssh/dts-ci-key -F ~/.ssh/config_deploy dts-base-image-${DTS_VER}.wic.bmap.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ # do not release iso image until issue is fixed # see: https://github.com/dasharo/dasharo-issues/issues/288 # scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.iso.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ @@ -140,5 +139,3 @@ jobs: rm -rf dts-release-cicd-pipeline rm -f ~/.ssh/gitea-key rm -rf build - rm -f ~/.ssh/config - mv ~/.ssh/config-old ~/.ssh/config