diff --git a/.gitignore b/.gitignore index 6a7604a822..6736f0a2ec 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ vendor coverage/ .ruby-gemset .ruby-version +/.ssh diff --git a/bin/docker-execute b/bin/docker-execute index d9acd51f38..c53040ffc8 100755 --- a/bin/docker-execute +++ b/bin/docker-execute @@ -220,8 +220,7 @@ docker run -dit \ -v "$(pwd)/omnibus/lib:$CODE_DIR/omnibus/lib" \ -v "$(pwd)/omnibus/spec:$CODE_DIR/omnibus/spec" \ -v "$(pwd)/omnibus/script:$CODE_DIR/omnibus/script" \ - -v "$(pwd)/tmp:/$CODE_DIR/tmp" \ - -v "${HOME}/.ssh:/home/dependabot/.ssh" \ + -v "$(pwd)/tmp:/$CODE_DIR/tmp" \ --name "$CONTAINER_NAME" \ -e SSH_AUTH_SOCK=$SSH_AUTH_SOCK \ -e PACKAGE_NAME=$PACKAGE_NAME \ @@ -233,7 +232,13 @@ docker run -dit \ "$IMAGE_NAME" "${CONTAINER_ARGS[@]}" #docker exec ${CONTAINER_NAME} bash -c 'echo $SSH_AUTH_SOCK' -docker exec ${CONTAINER_NAME} bash -c 'eval $(ssh-agent); + +#docker exec ${CONTAINER_NAME} bash -c 'chmod dependabot:dependabot /home/dependabot/dependabot-core/tmp'; +docker exec ${CONTAINER_NAME} bash -c 'ls -ald /home/dependabot/dependabot-core/tmp; +ls -ald /home/dependabot/dependabot-core; +whoami; +chmod 777 /home/dependabot/dependabot-core; +eval $(ssh-agent); for c in $(ssh -p 29418 athmika@gerrit.helpshift.com gerrit query --current-patch-set project:${REPO_NAME} branch:feature/dependabot | grep revision | tr -s " " | cut -d " " -f 3); \ do ssh -p 29418 athmika@gerrit.helpshift.com gerrit review $c --abandon; \ diff --git a/bin/dry-run.rb b/bin/dry-run.rb index cf641aee06..8fd197aab0 100755 --- a/bin/dry-run.rb +++ b/bin/dry-run.rb @@ -515,13 +515,13 @@ def handle_dependabot_error(error:, dependency:) # checkout to feature branch so that all commits are made in this branch. Dir.chdir($repo_contents_path) do - + system("git checkout -b feature/dependabot") system("git merge --no-ff --no-commit origin/master") system("mkdir .github") # system("git commit -m ") - + end # Dir.chdir("tmp/aadhar/.github") do diff --git a/common/lib/dependabot/file_fetchers/base.rb b/common/lib/dependabot/file_fetchers/base.rb index c51ecf6c9c..e3596ec538 100644 --- a/common/lib/dependabot/file_fetchers/base.rb +++ b/common/lib/dependabot/file_fetchers/base.rb @@ -518,7 +518,7 @@ def _clone_repo_contents(target_directory:) br_opt = " --branch #{source.branch} --single-branch" if source.branch SharedHelpers.run_shell_command( <<~CMD - git clone --no-tags ssh://gerrit/#{source.repo}.git #{path} + git clone --no-tags ssh://gerrit.helpshift.com/#{source.repo}.git #{path} CMD ) diff --git a/ssh/config b/ssh/config deleted file mode 100644 index f5fe25c7c9..0000000000 --- a/ssh/config +++ /dev/null @@ -1,17 +0,0 @@ - -Host gerrit - AddKeysToAgent yes - HostName gerrit.helpshift.com - Port 29418 - User athmika - IdentityFile ~/.ssh/id_rsa - # IgnoreUnknown UseKeychain - # UseKeyChain yes - ForwardAgent yes - StrictHostkeyChecking no - -Host * - ForwardAgent yes - AddKeysToAgent yes -# UseKeychain yes - diff --git a/ssh/id_rsa b/ssh/id_rsa deleted file mode 100644 index 6476f4e5eb..0000000000 --- a/ssh/id_rsa +++ /dev/null @@ -1,39 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -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 ------END OPENSSH PRIVATE KEY----- diff --git a/ssh/id_rsa.pub b/ssh/id_rsa.pub deleted file mode 100644 index f00e76c675..0000000000 --- a/ssh/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCvqKNJ/rR8oCb7Eowx2i4+h/fFg6hd9M4n2sqUCwZ8yV5RsWmqTPi3r8RhaTfqD1dK8esDKiFHbu9tvbMWM414U4juvD8wHFxHvQIKSpltN0ctH50GrzrnmWohTPdJ/dJfFP/HjJ6siCN0OgsFVZufmlkIltYAnzS8LT27CQ2x1plG/+wWN8OcAVSfCHb3/1DbXcpR0ck0uwiGbewCNP/wR8WZtrd2UdR2YeI8Wdk5Fc+OOmx5yPcAqEHzHay90HUBP85Ts0FmFQHTac+s+MUl16GDjgkeO3r0ToQlntUVeMSebZXpOBuahWg+44QMdwZJTYIs8GE9xjGjxnKOtzmUukniMfMc/j99B3ONDSWrRgZbVRN/2Eco/Y8Cs3nta23gb8U/EIkTMqfmttBqSOiyhrFoCIBLIugD8qKT/xqDaS5K40rFcfU1rHinFcX4WEn0dWfmnLTZ/qiShaVbPgd3QYzrRFKZOO93Cw/VHIC5Bn+EJYFQSOQQQXw3Wqqme1s= athmika@Athmikas-MacBook-Pro.local diff --git a/ssh/known_hosts b/ssh/known_hosts deleted file mode 100644 index 6708dc5eb3..0000000000 --- a/ssh/known_hosts +++ /dev/null @@ -1,10 +0,0 @@ -[gerrit.helpshift.com]:29418,[13.56.82.56]:29418 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMLL43fdqGJFOK2zxDrlYLqaEqVe1kQ7Roeokq54rMkSfVBlCTXH6XOCZ9uV+R2cYxCkYClru5B8LmslaR4tU7A= -52.80.206.251 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEl8Q/n6P9h/pzuVyjsRxiYVc+GjZ4Sc0oOQTcU9Du5A3Qcgxz+0F4oEg25RueOkuQq9IHTEb/+efx39gpLLS0U= -jump-nv.p.helpshift.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOUGt4xVqJzSwQq23aiTvyuZIzzT9aX2wDEwTgrgKAsn -jump-nv.p.helpshift.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDjTVpDisqq0PHNNcsx6+0Of/h0iZ8aR3HsVRc7sSG9zUhy6hWuOj6/W6qRKSvu8MTlNCklx109jyT042Flg0jjZLW3IMeUBLkUVi8cNuRHP6+wW9qYWl2S0TR59ewURQND9XDCg/J6N5g5xeCXhYyfxyhgM8Nq8RO7+H94a0ScEuh/R6X1iSP8SA3bzi7xdwUhlC3E/6feK9ZbrmwCeaFlnCHm2AOPcONBFD9Xz2yVs7JA9zJXFyL1wj51Urdtu14m0pwyoN/OGj3PGJxRrzICl34Cc2IhZG4aE8rppzmCOr1EVLzMeXSH9fBm/M+0EHHcJ65KlMGf1D4UJ74GtSiN -jump-nv.p.helpshift.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOK3BQ+el52uhCeR3KDdFSfQlqcwn20XGgpWjVK75LztDAjzDAGkr7ypA2ZsAW2YzlOdxiiyK1iFvVOstfDx5y8= -ec2-34-233-120-183.compute-1.amazonaws.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH1tKo/CkS7kr2Wt6C3jHjTPYf5NO/ejZAOzxOrpiEyI -|1|TLRLutRJscOfk57G3/9EDHcoM6c=|0MUUb0QSRbMmTvbcXwOI3YEYIHU= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGn0+/jvvfH8RYgNKkTWQQq5YvgL02xr/f1QALnFonXv1xCJv/gIZvyIInZF9BVbjy4oX3lDJyjH+n7OHfMbvoA= -|1|T5oV8MkKbkZHxDboqmOWXvsFd64=|/TsLVt+SuTDI4Yh3yY/jrF9o2Y8= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGn0+/jvvfH8RYgNKkTWQQq5YvgL02xr/f1QALnFonXv1xCJv/gIZvyIInZF9BVbjy4oX3lDJyjH+n7OHfMbvoA= -|1|/sByKs6G2R4Pcr3S6/cSXJHk7oQ=|/uS5ExXU/o1Cbk7EO9kHWmHaATU= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg= -|1|BNAsn/Rf69ISsECnLWsmtLHnSlY=|iswvEm/VNbB1T6v3XWgWgwBacQs= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg= diff --git a/ssh/known_hosts.old b/ssh/known_hosts.old deleted file mode 100644 index f67cee3e10..0000000000 --- a/ssh/known_hosts.old +++ /dev/null @@ -1,3 +0,0 @@ -[gerrit.helpshift.com]:29418,[13.56.82.56]:29418 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMLL43fdqGJFOK2zxDrlYLqaEqVe1kQ7Roeokq54rMkSfVBlCTXH6XOCZ9uV+R2cYxCkYClru5B8LmslaR4tU7A= -52.80.206.251 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEl8Q/n6P9h/pzuVyjsRxiYVc+GjZ4Sc0oOQTcU9Du5A3Qcgxz+0F4oEg25RueOkuQq9IHTEb/+efx39gpLLS0U= -jump-nv.p.helpshift.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOUGt4xVqJzSwQq23aiTvyuZIzzT9aX2wDEwTgrgKAsn diff --git a/ssh/podman-machine-default b/ssh/podman-machine-default deleted file mode 100644 index 5d0ae40673..0000000000 --- a/ssh/podman-machine-default +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW -QyNTUxOQAAACBrMDb4b/yszg4kFtAAbnYNNJEKQzcDy2LLmSdwAsF1vQAAAKhakPiuWpD4 -rgAAAAtzc2gtZWQyNTUxOQAAACBrMDb4b/yszg4kFtAAbnYNNJEKQzcDy2LLmSdwAsF1vQ -AAAEBNVwezVzE3IMfRfVSczB4Fe0zUm3a0onT+c7hZD4sZ2WswNvhv/KzODiQW0ABudg00 -kQpDNwPLYsuZJ3ACwXW9AAAAImF0aG1pa2FAQXRobWlrYXMtTWFjQm9vay1Qcm8ubG9jYW -wBAgM= ------END OPENSSH PRIVATE KEY----- diff --git a/ssh/podman-machine-default.pub b/ssh/podman-machine-default.pub deleted file mode 100644 index e983b74d64..0000000000 --- a/ssh/podman-machine-default.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGswNvhv/KzODiQW0ABudg00kQpDNwPLYsuZJ3ACwXW9 athmika@Athmikas-MacBook-Pro.local