Skip to content

Commit a7a58b8

Browse files
authored
update pipeline (Azure#3583)
1 parent c353c4e commit a7a58b8

File tree

2 files changed

+26
-14
lines changed

2 files changed

+26
-14
lines changed

src/aks-preview/azcli_aks_live_test/vsts-azcli-aks-live-test.yaml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ variables:
1414
- group: azcli-aks-tool
1515
- name: ContainerName
1616
value: "azcli-aks-live-test"
17+
- name: REPO_NAME
18+
value: "azure-cli-extensions"
1719
- name: LIVE_TEST_BASE_DIR
1820
value: "azure-cli-extensions/src/aks-preview/azcli_aks_live_test"
21+
- name: AKS_PREVIEW_BASE_DIR
22+
value: "azure-cli-extensions/src/aks-preview/azext_aks_preview"
1923

2024
jobs:
2125
- job: LiveTest
@@ -25,18 +29,15 @@ jobs:
2529
displayName: "Live Test with Python"
2630
steps:
2731
- bash: |
28-
pwd
29-
ls -alh
30-
mkdir azure-cli-extensions
32+
mkdir $(REPO_NAME)
3133
shopt -s extglob dotglob
32-
mv !(azure-cli-extensions) azure-cli-extensions
34+
mv !($(REPO_NAME)) $(REPO_NAME)
3335
shopt -u extglob dotglob
34-
ls -alh
35-
displayName: "Move All Checkout Files to the Newly Created 'azure-cli-extensions' Directory"
36+
displayName: "Move All Files to a Subdirectory"
3637
- bash: |
3738
$(LIVE_TEST_BASE_DIR)/scripts/clone_repo.sh
3839
condition: succeeded()
39-
displayName: "Clone GitHub Repo and Move Test Related Files"
40+
displayName: "Clone GitHub Repo(s) and Extract Test Scripts"
4041
- bash: |
4142
./scripts/prepare_image.sh
4243
condition: succeeded()
@@ -68,6 +69,17 @@ jobs:
6869
flattenFolders: true
6970
targetFolder: $(Build.ArtifactStagingDirectory)
7071
condition: succeededOrFailed()
72+
displayName: "Copy Reports & Logs"
73+
- bash: mkdir -p $(Build.ArtifactStagingDirectory)/recordings
74+
condition: succeededOrFailed()
75+
displayName: "Create Dir for Recordings"
76+
- task: CopyFiles@2
77+
inputs:
78+
contents: '$(AKS_PREVIEW_BASE_DIR)/tests/latest/recordings/**'
79+
flattenFolders: true
80+
targetFolder: $(Build.ArtifactStagingDirectory)/recordings
81+
condition: succeededOrFailed()
82+
displayName: "Copy Recordings"
7183
- task: PublishBuildArtifacts@1
7284
inputs:
7385
pathToPublish: $(Build.ArtifactStagingDirectory)

src/aks-preview/azcli_aks_live_test/vsts-azcli-aks-unit-test.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ variables:
1414
- group: azcli-aks-tool
1515
- name: ContainerName
1616
value: "azcli-aks-unit-test"
17+
- name: REPO_NAME
18+
value: "azure-cli-extensions"
1719
- name: LIVE_TEST_BASE_DIR
1820
value: "azure-cli-extensions/src/aks-preview/azcli_aks_live_test"
1921

@@ -25,18 +27,15 @@ jobs:
2527
displayName: "Unit Test with Python"
2628
steps:
2729
- bash: |
28-
pwd
29-
ls -alh
30-
mkdir azure-cli-extensions
30+
mkdir $(REPO_NAME)
3131
shopt -s extglob dotglob
32-
mv !(azure-cli-extensions) azure-cli-extensions
32+
mv !($(REPO_NAME)) $(REPO_NAME)
3333
shopt -u extglob dotglob
34-
ls -alh
35-
displayName: "Move All Checkout Files to the Newly Created 'azure-cli-extensions' Directory"
34+
displayName: "Move All Files to a Subdirectory"
3635
- bash: |
3736
$(LIVE_TEST_BASE_DIR)/scripts/clone_repo.sh
3837
condition: succeeded()
39-
displayName: "Clone GitHub Repo and Move Test Related Files"
38+
displayName: "Clone GitHub Repo(s) and Extract Test Scripts"
4039
- bash: |
4140
./scripts/prepare_image.sh
4241
condition: succeeded()
@@ -68,6 +67,7 @@ jobs:
6867
flattenFolders: true
6968
targetFolder: $(Build.ArtifactStagingDirectory)
7069
condition: succeededOrFailed()
70+
displayName: "Copy Reports & Logs"
7171
- task: PublishBuildArtifacts@1
7272
inputs:
7373
pathToPublish: $(Build.ArtifactStagingDirectory)

0 commit comments

Comments
 (0)