Skip to content
This repository has been archived by the owner on Apr 13, 2020. It is now read-only.

Revert "Get service display name using new command in pipeline" #545

Closed
wants to merge 1 commit into from
Closed

Revert "Get service display name using new command in pipeline" #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/lib/fileutils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,16 +195,17 @@ export const serviceBuildAndUpdatePipeline = (
},
{
script: generateYamlScript([
`. ./build.sh --source-only`,
`get_spk_version`,
`download_spk`,
`export BUILD_REPO_NAME=${BUILD_REPO_NAME(serviceName)}`,
`tag_name="$BUILD_REPO_NAME:${IMAGE_TAG}"`,
`commitId=$(Build.SourceVersion)`,
`commitId=$(echo "\${commitId:0:7}")`,
`service=$(./spk/spk service get-display-name -p ${relativeServiceForDockerfile})`,
`service=$(Build.Repository.Name)`,
`service=\${service##*/}`,
`url=$(git remote --verbose | grep origin | grep fetch | cut -f2 | cut -d' ' -f1)`,
`repourl=\${url##*@}`,
`. ./build.sh --source-only`,
`get_spk_version`,
`download_spk`,
`./spk/spk deployment create -n $(INTROSPECTION_ACCOUNT_NAME) -k $(INTROSPECTION_ACCOUNT_KEY) -t $(INTROSPECTION_TABLE_NAME) -p $(INTROSPECTION_PARTITION_KEY) --p1 $(Build.BuildId) --image-tag $tag_name --commit-id $commitId --service $service --repository $repourl`,
]),
displayName:
Expand Down
9 changes: 5 additions & 4 deletions src/test/mockFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,17 @@ export const createTestServiceBuildAndUpdatePipelineYaml = (
},
{
script: generateYamlScript([
`. ./build.sh --source-only`,
`get_spk_version`,
`download_spk`,
`export BUILD_REPO_NAME=${BUILD_REPO_NAME(serviceName)}`,
`tag_name="$BUILD_REPO_NAME:${IMAGE_TAG}"`,
`commitId=$(Build.SourceVersion)`,
`commitId=$(echo "\${commitId:0:7}")`,
`service=$(./spk/spk service get-display-name -p ${relativeServiceForDockerfile})`,
`service=$(Build.Repository.Name)`,
`service=\${service##*/}`,
`url=$(git remote --verbose | grep origin | grep fetch | cut -f2 | cut -d' ' -f1)`,
`repourl=\${url##*@}`,
`. ./build.sh --source-only`,
`get_spk_version`,
`download_spk`,
`./spk/spk deployment create -n $(INTROSPECTION_ACCOUNT_NAME) -k $(INTROSPECTION_ACCOUNT_KEY) -t $(INTROSPECTION_TABLE_NAME) -p $(INTROSPECTION_PARTITION_KEY) --p1 $(Build.BuildId) --image-tag $tag_name --commit-id $commitId --service $service --repository $repourl`,
]),
displayName:
Expand Down
7 changes: 3 additions & 4 deletions tests/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ data, set up a Logic App to delete it. You can use the template
for this. Edit the values in `parameters` and fill in your `<subscription id>`
and `resource group` where the storage account is.

To check existing Logic Apps in your subscription, go to the
[portal.azure.com](http://portal.azure.com) and search for Logic Apps.
To check existing Logic Apps in your subscription, go to the [portal.azure.com](http://portal.azure.com) and search for Logic Apps.

# Scenarios Exercised So Far

Expand Down Expand Up @@ -85,11 +84,11 @@ To check existing Logic Apps in your subscription, go to the

| Command | Coverage |
| ------------------------ | -------- |
| spk deployment get | ✅ |
| spk deployment get | 🚫 |
| spk deployment onboard | ✅ |
| spk deployment validate | 🚫 |
| spk deployment dashboard | 🚫 |
| spk deployment create | ✅ |
| spk deployment create | 🚫 |

## Infrastructure Management

Expand Down