File tree Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change 85
85
exit 1
86
86
fi
87
87
88
- if ! which octo
88
+ if ! ( which octo || which dotnet-octo)
89
89
then
90
90
echo " You must install the Octopus CLI"
91
91
exit 1
92
92
fi
93
93
fi
94
94
95
+ OCTOCLI=octo
96
+ if which dotnet-octo
97
+ then
98
+ OCTOCLI=dotnet-octo
99
+ fi
100
+
95
101
# We know these test credentials, so hard code them
96
102
export TF_VAR_git_username=" octopus"
97
103
export TF_VAR_git_password=" Password01!"
@@ -876,14 +882,14 @@ then
876
882
# Create the ArgoCD template and push it to Octopus
877
883
pushd argocd/template || exit 1
878
884
zip -r argocd_template.1.0.0.zip .
879
- octo push --server=http://localhost:18080 --apiKey=API-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -space=Spaces-4 --package=argocd_template.1.0.0.zip --replace-existing
885
+ ${OCTOCLI} push --server=http://localhost:18080 --apiKey=API-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -space=Spaces-4 --package=argocd_template.1.0.0.zip --replace-existing
880
886
rm argocd_template.1.0.0.zip
881
887
popd || exit 1
882
888
883
889
# Create the ArgoCD project Terraform module package and push it to Octopus
884
890
pushd argocd_dashboard/projects || exit 1
885
891
zip -r argocd_octopus_projects.1.0.0.zip . -i ' *.tf' ' *.sh'
886
- octo push --server=http://localhost:18080 --apiKey=API-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -space=Spaces-4 --package=argocd_octopus_projects.1.0.0.zip --replace-existing
892
+ ${OCTOCLI} push --server=http://localhost:18080 --apiKey=API-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -space=Spaces-4 --package=argocd_octopus_projects.1.0.0.zip --replace-existing
887
893
rm argocd_octopus_projects.1.0.0.zip
888
894
popd || exit 1
889
895
You can’t perform that action at this time.
0 commit comments