Skip to content

Commit

Permalink
Simplify SNP pipeline - generate SSH key inline (#6856)
Browse files Browse the repository at this point in the history
  • Loading branch information
eddyashton authored Feb 27, 2025
1 parent 6da2606 commit 66b0226
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 34 deletions.
20 changes: 1 addition & 19 deletions .azure-pipelines-templates/deploy_aci.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,9 @@
jobs:
- job: generate_ssh_key
displayName: "Generate SSH Key"
variables:
Codeql.SkipTaskAutoInjection: true
skipComponentGovernanceDetection: true
pool:
vmImage: ubuntu-20.04
steps:
- checkout: none

- template: generate_ssh_key.yml

- job: deploy_primary_aci
displayName: "Deploy ACI"
dependsOn:
- generate_ssh_key
variables:
Codeql.SkipTaskAutoInjection: true
skipComponentGovernanceDetection: true
sshKey: $[ dependencies.generate_ssh_key.outputs['generate_ssh_key.sshKey'] ]
pool:
name: ado-virtual-ccf-sub # To build CCF quickly
demands:
Expand All @@ -31,9 +16,7 @@ jobs:
fetchDepth: 0
fetchTags: true

- template: install_ssh_key.yml
parameters:
ssh_key: $(sshKey)
- template: generate_ssh_key.yml

- template: azure_cli.yml
parameters:
Expand Down Expand Up @@ -70,7 +53,6 @@ jobs:
--memory-gb 64 \
--core-count 16 \
--aci-setup-timeout 300 \
--aci-private-key-b64 $(sshKey) \
--out ~/aci_ips
# Create a ~/ipAddresses files which is a list of `<container group name> <IP address>` separated by newlines.
source ./scripts/azure_deployment/escape_data.sh # Include escape_data to handle newlines.
Expand Down
3 changes: 1 addition & 2 deletions .azure-pipelines-templates/generate_ssh_key.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
steps:
- script: |
set -ex
mkdir -p ~/.ssh
ssh-keygen -t rsa -b 4096 -f ~/.ssh/id_rsa -N ""
echo "##vso[task.setvariable variable=sshKey;isOutput=true;issecret=true]`base64 -w 0 ~/.ssh/id_rsa`"
name: generate_ssh_key
displayName: "Generate SSH Key"
11 changes: 0 additions & 11 deletions .azure-pipelines-templates/install_ssh_key.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .snpcc_canary
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
___ ___ ___ \/
(. =) Y (0 0) (x X) Y (__)
(. =) Y (0 0) (x X) Y (vv)
O \ o | / |
/-xXx--//-----x=x--/-xXx--/---x-/--->>>--/
...
/\/\d(-_-)b/\/\
----vmpl----
----vmpl----

0 comments on commit 66b0226

Please sign in to comment.