diff --git a/apps/cli/executables/pexable/carta_envoy/carta_envoy/connect.py b/apps/cli/executables/pexable/carta_envoy/carta_envoy/connect.py index 978ff0cc3b6b139911e48944e90c7d16f1dcbc44..8ec6beed9f06a2a4b71870e114fe49f23ef6957f 100644 --- a/apps/cli/executables/pexable/carta_envoy/carta_envoy/connect.py +++ b/apps/cli/executables/pexable/carta_envoy/carta_envoy/connect.py @@ -15,6 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with Workspaces. If not, see <https://www.gnu.org/licenses/>. + import logging import socket from typing import Dict diff --git a/ci/bin/generate-go-yaml.py b/ci/bin/generate-go-yaml.py index 90bd95cd7cfd6b06f0f6a42bf428df765fd22402..1f0cfbb44b47e6c4250133d345016864dc105b9f 100755 --- a/ci/bin/generate-go-yaml.py +++ b/ci/bin/generate-go-yaml.py @@ -68,10 +68,11 @@ go-{go_name}-release: needs: ["go-{go_name}-build"] before_script: - mkdir -p ~/.ssh - - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) + - chmod 400 "$SSH_PRIVATE_KEY" + - ssh-add "$SSH_PRIVATE_KEY" - chmod 700 ~/.ssh - - echo "$SSH_PRIVATE_KEY" | ssh-add - > ~/.ssh/id_rsa - '[[ -f /.dockerenv ]] && echo -e "Host *\\n\\tStrictHostKeyChecking no\\n\\n" > ~/.ssh/config' script: - echo "Releasing module to sbin area - {go_name}" diff --git a/ci/push-package.template.yml b/ci/push-package.template.yml index ea92b88cdcab52ec5180636b1c56dee73f4006b0..ae6aed91648776ee18b750c0b3e1e7ba0cd4d180 100644 --- a/ci/push-package.template.yml +++ b/ci/push-package.template.yml @@ -3,10 +3,11 @@ image: python:3.10-slim before_script: - mkdir -p ~/.ssh - - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) + - chmod 400 "$SSH_PRIVATE_KEY" + - ssh-add "$SSH_PRIVATE_KEY" - chmod 700 ~/.ssh - - echo "$SSH_PRIVATE_KEY" | ssh-add - > ~/.ssh/id_rsa - '[[ -f /.dockerenv ]] && echo -e "Host *\\n\\tStrictHostKeyChecking no\\n\\n" > ~/.ssh/config' script: - mkdir -p /home/ssa/bin