From 5982baaab1ec4da95a5f98b2bbc17de112f08c8b Mon Sep 17 00:00:00 2001 From: SparkSnail Date: Mon, 10 Feb 2020 11:51:38 +0800 Subject: [PATCH 01/18] fix endpoint --- test/pipelines-it-remote.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/pipelines-it-remote.yml b/test/pipelines-it-remote.yml index 8fe96552fb..55db1b2037 100644 --- a/test/pipelines-it-remote.yml +++ b/test/pipelines-it-remote.yml @@ -20,21 +20,21 @@ jobs: displayName: 'Install dependencies for integration tests in remote mode' - task: CopyFilesOverSSH@0 inputs: - sshEndpoint: remote_nni-ci-gpu-01 + sshEndpoint: $(end_point) sourceFolder: deployment/pypi/dist/ targetFolder: /tmp/nnitest/$(Build.BuildId)/dist overwrite: true displayName: 'Copy dist files to remote machine' - task: CopyFilesOverSSH@0 inputs: - sshEndpoint: remote_nni-ci-gpu-01 + sshEndpoint: $(end_point) sourceFolder: test targetFolder: /tmp/nnitest/$(Build.BuildId)/test overwrite: true displayName: 'Copy test files to remote machine' - task: SSH@0 inputs: - sshEndpoint: remote_nni-ci-gpu-01 + sshEndpoint: $(end_point) runOptions: commands commands: python3 /tmp/nnitest/$(Build.BuildId)/test/remote_docker.py --mode start --name $(Build.BuildId) --image nni/nni displayName: 'Start docker' From 565362423c5b4d50b5cbaf949119cade217d7d59 Mon Sep 17 00:00:00 2001 From: SparkSnail Date: Mon, 10 Feb 2020 13:22:33 +0800 Subject: [PATCH 02/18] add private key --- test/pipelines-it-remote.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/pipelines-it-remote.yml b/test/pipelines-it-remote.yml index 55db1b2037..8b19cbd5f4 100644 --- a/test/pipelines-it-remote.yml +++ b/test/pipelines-it-remote.yml @@ -40,11 +40,11 @@ jobs: displayName: 'Start docker' - task: DownloadSecureFile@1 inputs: - secureFile: remote_ci_private_key + secureFile: $(remote_private_key) - script: | - cp $(Agent.TempDirectory)/remote_ci_private_key test/id_rsa + cp $(Agent.TempDirectory)/$(remote_private_key) test/id_rsa chmod 600 test/id_rsa - scp -i test/id_rsa $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test/port + scp -P $(remote_port) -i test/id_rsa $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test/port cat test/port displayName: 'Get docker port' - script: | From 1cb23493ebd9faad5a65deb52d82947f705384a8 Mon Sep 17 00:00:00 2001 From: SparkSnail Date: Mon, 10 Feb 2020 16:08:44 +0800 Subject: [PATCH 03/18] fix torchversion --- deployment/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/docker/Dockerfile b/deployment/docker/Dockerfile index b2c417e1b1..e89cf1def4 100644 --- a/deployment/docker/Dockerfile +++ b/deployment/docker/Dockerfile @@ -52,7 +52,7 @@ RUN python3 -m pip --no-cache-dir install Keras==2.1.6 # PyTorch # RUN python3 -m pip --no-cache-dir install torch==1.2.0 -RUN python3 -m pip install torchvision==0.4.0 +RUN python3 -m pip install torchvision==0.5.0 # # sklearn 0.20.0 From 99b0c08013479a3e09fd7a76e95790bfc63eddf2 Mon Sep 17 00:00:00 2001 From: SparkSnail Date: Tue, 11 Feb 2020 12:01:51 +0800 Subject: [PATCH 04/18] add debug info --- test/pipelines-it-remote-windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/pipelines-it-remote-windows.yml b/test/pipelines-it-remote-windows.yml index fb7a088823..b5fc0dafb1 100644 --- a/test/pipelines-it-remote-windows.yml +++ b/test/pipelines-it-remote-windows.yml @@ -32,7 +32,10 @@ jobs: - powershell: | Write-Host "Downloading Putty..." (New-Object Net.WebClient).DownloadFile("https://the.earth.li/~sgtatham/putty/latest/w64/pscp.exe", "$(Agent.TempDirectory)\pscp.exe") + Write-Host "Download Putty success!" + Write-Host "Connecting to host..." $(Agent.TempDirectory)\pscp.exe -hostkey $(hostkey) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port + Write-Host "Get port success!" Get-Content test\port displayName: 'Get docker port' - powershell: | From fe60ba54dfa592e545851732aedd8d14fe63b0a5 Mon Sep 17 00:00:00 2001 From: SparkSnail Date: Tue, 11 Feb 2020 12:25:12 +0800 Subject: [PATCH 05/18] add port in pscp.exe --- test/pipelines-it-remote-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pipelines-it-remote-windows.yml b/test/pipelines-it-remote-windows.yml index b5fc0dafb1..1d14572f93 100644 --- a/test/pipelines-it-remote-windows.yml +++ b/test/pipelines-it-remote-windows.yml @@ -34,7 +34,7 @@ jobs: (New-Object Net.WebClient).DownloadFile("https://the.earth.li/~sgtatham/putty/latest/w64/pscp.exe", "$(Agent.TempDirectory)\pscp.exe") Write-Host "Download Putty success!" Write-Host "Connecting to host..." - $(Agent.TempDirectory)\pscp.exe -hostkey $(hostkey) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port + $(Agent.TempDirectory)\pscp.exe -P $(remote_port) -hostkey $(hostkey) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port Write-Host "Get port success!" Get-Content test\port displayName: 'Get docker port' From 52aa6ad37d5bb39beafa9a390b63a3ebe82a67b2 Mon Sep 17 00:00:00 2001 From: SparkSnail Date: Thu, 13 Feb 2020 10:09:01 +0800 Subject: [PATCH 06/18] fix remote pipeline --- test/pipelines-it-remote.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pipelines-it-remote.yml b/test/pipelines-it-remote.yml index 8b19cbd5f4..1ed2c9fd9b 100644 --- a/test/pipelines-it-remote.yml +++ b/test/pipelines-it-remote.yml @@ -58,7 +58,7 @@ jobs: displayName: 'integration test' - task: SSH@0 inputs: - sshEndpoint: remote_nni-ci-gpu-01 + sshEndpoint: $(end_point) runOptions: commands commands: python3 /tmp/nnitest/$(Build.BuildId)/test/remote_docker.py --mode stop --name $(Build.BuildId) displayName: 'Stop docker' From 6a96403d4710a4386d34f3729bd01681b1babb44 Mon Sep 17 00:00:00 2001 From: SparkSnail Date: Thu, 5 Mar 2020 15:16:20 +0800 Subject: [PATCH 07/18] fix remote-windows-pipeline --- test/pipelines-it-remote-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pipelines-it-remote-windows.yml b/test/pipelines-it-remote-windows.yml index a7bbeb9dbc..87c6c17e14 100644 --- a/test/pipelines-it-remote-windows.yml +++ b/test/pipelines-it-remote-windows.yml @@ -35,7 +35,7 @@ jobs: (New-Object Net.WebClient).DownloadFile("https://the.earth.li/~sgtatham/putty/latest/w64/pscp.exe", "$(Agent.TempDirectory)\pscp.exe") Write-Host "Download Putty success!" Write-Host "Connecting to host..." - $(Agent.TempDirectory)\pscp.exe -P $(remote_port) -hostkey $(hostkey) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port + $(Agent.TempDirectory)\pscp.exe -P $(remote_port) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port Write-Host "Get port success!" Get-Content test\port displayName: 'Get docker port' From 13bb9f2edf8ade753fe7418791ee0ebb6c897492 Mon Sep 17 00:00:00 2001 From: Shinai Yang Date: Tue, 31 Mar 2020 10:54:42 +0800 Subject: [PATCH 08/18] remove sudo --- test/pipelines/pipelines-it-remote-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pipelines/pipelines-it-remote-windows.yml b/test/pipelines/pipelines-it-remote-windows.yml index eeb6ae14ba..8c8ccfa650 100644 --- a/test/pipelines/pipelines-it-remote-windows.yml +++ b/test/pipelines/pipelines-it-remote-windows.yml @@ -56,5 +56,5 @@ jobs: inputs: sshEndpoint: $(end_point) runOptions: commands - commands: sudo rm -rf /tmp/nnitest/$(Build.BuildId) + commands: rm -rf /tmp/nnitest/$(Build.BuildId) displayName: 'Clean the remote files' From 6e1d8221e32bfe6b5b0982001d8935a89928f75a Mon Sep 17 00:00:00 2001 From: SparkSnail Date: Wed, 1 Apr 2020 00:29:09 +0800 Subject: [PATCH 09/18] fix error --- test/pipelines-it-remote-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pipelines-it-remote-windows.yml b/test/pipelines-it-remote-windows.yml index 87c6c17e14..9e1882c5aa 100644 --- a/test/pipelines-it-remote-windows.yml +++ b/test/pipelines-it-remote-windows.yml @@ -35,7 +35,7 @@ jobs: (New-Object Net.WebClient).DownloadFile("https://the.earth.li/~sgtatham/putty/latest/w64/pscp.exe", "$(Agent.TempDirectory)\pscp.exe") Write-Host "Download Putty success!" Write-Host "Connecting to host..." - $(Agent.TempDirectory)\pscp.exe -P $(remote_port) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port + $(Agent.TempDirectory)\pscp.exe -P $(remote_port) -hostkey $(hostkey) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port Write-Host "Get port success!" Get-Content test\port displayName: 'Get docker port' From 4faeb067caab85d50a862be97ddbea674acaca7d Mon Sep 17 00:00:00 2001 From: SparkSnail Date: Wed, 1 Apr 2020 00:31:28 +0800 Subject: [PATCH 10/18] format code --- test/pipelines-it-remote-windows.yml | 59 ++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 test/pipelines-it-remote-windows.yml diff --git a/test/pipelines-it-remote-windows.yml b/test/pipelines-it-remote-windows.yml new file mode 100644 index 0000000000..a7bbeb9dbc --- /dev/null +++ b/test/pipelines-it-remote-windows.yml @@ -0,0 +1,59 @@ +jobs: +- job: 'integration_test_remote_windows' + timeoutInMinutes: 0 + + steps: + - script: python -m pip install --upgrade pip setuptools + displayName: 'Install python tools' + - task: CopyFilesOverSSH@0 + inputs: + sshEndpoint: $(end_point) + targetFolder: /tmp/nnitest/$(Build.BuildId)/nni-remote + overwrite: true + displayName: 'Copy all files to remote machine' + - script: | + powershell.exe -file install.ps1 + displayName: 'Install nni toolkit via source code' + - script: | + python -m pip install scikit-learn==0.20.1 --user + displayName: 'Install dependencies for integration tests' + - task: SSH@0 + inputs: + sshEndpoint: $(end_point) + runOptions: inline + inline: cd /tmp/nnitest/$(Build.BuildId)/nni-remote/deployment/pypi;make build + continueOnError: true + displayName: 'build nni bdsit_wheel' + - task: SSH@0 + inputs: + sshEndpoint: $(end_point) + runOptions: commands + commands: python3 /tmp/nnitest/$(Build.BuildId)/nni-remote/test/remote_docker.py --mode start --name $(Build.BuildId) --image nni/nni --os windows + displayName: 'Start docker' + - powershell: | + Write-Host "Downloading Putty..." + (New-Object Net.WebClient).DownloadFile("https://the.earth.li/~sgtatham/putty/latest/w64/pscp.exe", "$(Agent.TempDirectory)\pscp.exe") + Write-Host "Download Putty success!" + Write-Host "Connecting to host..." + $(Agent.TempDirectory)\pscp.exe -P $(remote_port) -hostkey $(hostkey) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port + Write-Host "Get port success!" + Get-Content test\port + displayName: 'Get docker port' + - powershell: | + cd test + python generate_ts_config.py --ts remote --remote_user $(docker_user) --remote_host $(remote_host) --remote_port $(Get-Content port) --remote_pwd $(docker_pwd) --nni_manager_ip $(nni_manager_ip) + Get-Content training_service.yml + python config_test.py --ts remote --exclude cifar10,smac,bohb + displayName: 'integration test' + - task: SSH@0 + inputs: + sshEndpoint: $(end_point) + runOptions: commands + commands: python3 /tmp/nnitest/$(Build.BuildId)/nni-remote/test/remote_docker.py --mode stop --name $(Build.BuildId) --os windows + displayName: 'Stop docker' + - task: SSH@0 + inputs: + sshEndpoint: $(end_point) + runOptions: commands + commands: sudo rm -rf /tmp/nnitest/$(Build.BuildId) + displayName: 'Clean the remote files' From 21aa3b5bdc26a85b5272ee64a6557c761d1af971 Mon Sep 17 00:00:00 2001 From: SparkSnail Date: Wed, 1 Apr 2020 00:34:01 +0800 Subject: [PATCH 11/18] fix error --- test/pipelines/pipelines-it-remote-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pipelines/pipelines-it-remote-windows.yml b/test/pipelines/pipelines-it-remote-windows.yml index 2900e8ee1f..e3d083b073 100644 --- a/test/pipelines/pipelines-it-remote-windows.yml +++ b/test/pipelines/pipelines-it-remote-windows.yml @@ -36,7 +36,7 @@ jobs: (New-Object Net.WebClient).DownloadFile("https://the.earth.li/~sgtatham/putty/latest/w64/pscp.exe", "$(Agent.TempDirectory)\pscp.exe") Write-Host "Download Putty success!" Write-Host "Connecting to host..." - $(Agent.TempDirectory)\pscp.exe -P $(remote_port) -hostkey $(hostkey) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port + $(Agent.TempDirectory)\pscp.exe -P $(remote_port) -hostkey $(hostkey) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port Write-Host "Get port success!" Get-Content test\port displayName: 'Get docker port' From ffa8c6b225fc32e77ceada4cb5ca868dae06e78d Mon Sep 17 00:00:00 2001 From: SparkSnail Date: Wed, 1 Apr 2020 00:34:31 +0800 Subject: [PATCH 12/18] fix error --- test/pipelines-it-remote-windows.yml | 59 ---------------------------- 1 file changed, 59 deletions(-) delete mode 100644 test/pipelines-it-remote-windows.yml diff --git a/test/pipelines-it-remote-windows.yml b/test/pipelines-it-remote-windows.yml deleted file mode 100644 index a7bbeb9dbc..0000000000 --- a/test/pipelines-it-remote-windows.yml +++ /dev/null @@ -1,59 +0,0 @@ -jobs: -- job: 'integration_test_remote_windows' - timeoutInMinutes: 0 - - steps: - - script: python -m pip install --upgrade pip setuptools - displayName: 'Install python tools' - - task: CopyFilesOverSSH@0 - inputs: - sshEndpoint: $(end_point) - targetFolder: /tmp/nnitest/$(Build.BuildId)/nni-remote - overwrite: true - displayName: 'Copy all files to remote machine' - - script: | - powershell.exe -file install.ps1 - displayName: 'Install nni toolkit via source code' - - script: | - python -m pip install scikit-learn==0.20.1 --user - displayName: 'Install dependencies for integration tests' - - task: SSH@0 - inputs: - sshEndpoint: $(end_point) - runOptions: inline - inline: cd /tmp/nnitest/$(Build.BuildId)/nni-remote/deployment/pypi;make build - continueOnError: true - displayName: 'build nni bdsit_wheel' - - task: SSH@0 - inputs: - sshEndpoint: $(end_point) - runOptions: commands - commands: python3 /tmp/nnitest/$(Build.BuildId)/nni-remote/test/remote_docker.py --mode start --name $(Build.BuildId) --image nni/nni --os windows - displayName: 'Start docker' - - powershell: | - Write-Host "Downloading Putty..." - (New-Object Net.WebClient).DownloadFile("https://the.earth.li/~sgtatham/putty/latest/w64/pscp.exe", "$(Agent.TempDirectory)\pscp.exe") - Write-Host "Download Putty success!" - Write-Host "Connecting to host..." - $(Agent.TempDirectory)\pscp.exe -P $(remote_port) -hostkey $(hostkey) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port - Write-Host "Get port success!" - Get-Content test\port - displayName: 'Get docker port' - - powershell: | - cd test - python generate_ts_config.py --ts remote --remote_user $(docker_user) --remote_host $(remote_host) --remote_port $(Get-Content port) --remote_pwd $(docker_pwd) --nni_manager_ip $(nni_manager_ip) - Get-Content training_service.yml - python config_test.py --ts remote --exclude cifar10,smac,bohb - displayName: 'integration test' - - task: SSH@0 - inputs: - sshEndpoint: $(end_point) - runOptions: commands - commands: python3 /tmp/nnitest/$(Build.BuildId)/nni-remote/test/remote_docker.py --mode stop --name $(Build.BuildId) --os windows - displayName: 'Stop docker' - - task: SSH@0 - inputs: - sshEndpoint: $(end_point) - runOptions: commands - commands: sudo rm -rf /tmp/nnitest/$(Build.BuildId) - displayName: 'Clean the remote files' From 4c49f607c331ded09963d8ccbdad741bcfecab33 Mon Sep 17 00:00:00 2001 From: SparkSnail Date: Wed, 1 Apr 2020 01:43:25 +0800 Subject: [PATCH 13/18] debug --- test/pipelines/pipelines-it-remote-windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pipelines/pipelines-it-remote-windows.yml b/test/pipelines/pipelines-it-remote-windows.yml index e3d083b073..cc3d369d83 100644 --- a/test/pipelines/pipelines-it-remote-windows.yml +++ b/test/pipelines/pipelines-it-remote-windows.yml @@ -36,7 +36,7 @@ jobs: (New-Object Net.WebClient).DownloadFile("https://the.earth.li/~sgtatham/putty/latest/w64/pscp.exe", "$(Agent.TempDirectory)\pscp.exe") Write-Host "Download Putty success!" Write-Host "Connecting to host..." - $(Agent.TempDirectory)\pscp.exe -P $(remote_port) -hostkey $(hostkey) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port + $(Agent.TempDirectory)\pscp.exe -P $(remote_port) -hostkey $(hostkey) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port Write-Host "Get port success!" Get-Content test\port displayName: 'Get docker port' @@ -56,5 +56,5 @@ jobs: inputs: sshEndpoint: $(end_point) runOptions: commands - commands: rm -rf /tmp/nnitest/$(Build.BuildId) + commands: whoami displayName: 'Clean the remote files' From 1057ad2c78251effb1116e3405e4ff5ba32b6e5d Mon Sep 17 00:00:00 2001 From: Shinai Yang Date: Wed, 1 Apr 2020 11:55:01 +0800 Subject: [PATCH 14/18] remove clean step --- test/pipelines/pipelines-it-remote-windows.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/pipelines/pipelines-it-remote-windows.yml b/test/pipelines/pipelines-it-remote-windows.yml index cc3d369d83..d0c6f471e0 100644 --- a/test/pipelines/pipelines-it-remote-windows.yml +++ b/test/pipelines/pipelines-it-remote-windows.yml @@ -52,9 +52,3 @@ jobs: runOptions: commands commands: python3 /tmp/nnitest/$(Build.BuildId)/nni-remote/test/nni_test/nnitest/remote_docker.py --mode stop --name $(Build.BuildId) --os windows displayName: 'Stop docker' - - task: SSH@0 - inputs: - sshEndpoint: $(end_point) - runOptions: commands - commands: whoami - displayName: 'Clean the remote files' From 0a52185b9c6a33c8e89f104e4ca5613b11b5cf55 Mon Sep 17 00:00:00 2001 From: Shinai Yang Date: Wed, 1 Apr 2020 11:56:00 +0800 Subject: [PATCH 15/18] format code --- test/pipelines/pipelines-it-remote-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pipelines/pipelines-it-remote-windows.yml b/test/pipelines/pipelines-it-remote-windows.yml index d0c6f471e0..63bcfb5c41 100644 --- a/test/pipelines/pipelines-it-remote-windows.yml +++ b/test/pipelines/pipelines-it-remote-windows.yml @@ -36,7 +36,7 @@ jobs: (New-Object Net.WebClient).DownloadFile("https://the.earth.li/~sgtatham/putty/latest/w64/pscp.exe", "$(Agent.TempDirectory)\pscp.exe") Write-Host "Download Putty success!" Write-Host "Connecting to host..." - $(Agent.TempDirectory)\pscp.exe -P $(remote_port) -hostkey $(hostkey) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port + $(Agent.TempDirectory)\pscp.exe -P $(remote_port) -hostkey $(hostkey) -pw $(pscp_pwd) $(remote_user)@$(remote_host):/tmp/nnitest/$(Build.BuildId)/port test\port Write-Host "Get port success!" Get-Content test\port displayName: 'Get docker port' From f07f3f4ef6dd40ff3dd45f9f9607f67c184c8d03 Mon Sep 17 00:00:00 2001 From: Shinai Yang Date: Sat, 4 Apr 2020 14:53:58 +0800 Subject: [PATCH 16/18] fix windows copy --- src/nni_manager/training_service/common/util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nni_manager/training_service/common/util.ts b/src/nni_manager/training_service/common/util.ts index 0d578ac7e7..9328f01e61 100644 --- a/src/nni_manager/training_service/common/util.ts +++ b/src/nni_manager/training_service/common/util.ts @@ -69,7 +69,7 @@ export async function execMkdir(directory: string, share: boolean = false): Prom */ export async function execCopydir(source: string, destination: string): Promise { if (process.platform === 'win32') { - await cpp.exec(`powershell.exe Copy-Item "${source}" -Destination "${destination}" -Recurse`); + await cpp.exec(`powershell.exe Copy-Item "${source}\\*" -Destination "${destination}" -Recurse`); } else { await cpp.exec(`cp -r '${source}/.' '${destination}'`); } From 1f786697c361621850fa062028f1b49d7dc2b750 Mon Sep 17 00:00:00 2001 From: Shinai Yang Date: Thu, 13 Aug 2020 12:11:34 +0800 Subject: [PATCH 17/18] fix pipeline --- test/nni_test/nnitest/remote_docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/nni_test/nnitest/remote_docker.py b/test/nni_test/nnitest/remote_docker.py index d0252e3feb..0f17688410 100644 --- a/test/nni_test/nnitest/remote_docker.py +++ b/test/nni_test/nnitest/remote_docker.py @@ -37,7 +37,7 @@ def start_container(image, name, nnimanager_os): '''Start docker container, generate a port in /tmp/nnitest/{name}/port file''' port = find_port() source_dir = '/tmp/nnitest/' + name - run_cmds = ['docker', 'run', '-d', '-p', str(port) + ':22', '--name', name, '--mount', 'type=bind,source=' + source_dir + ',target=/tmp/nni', image] + run_cmds = ['docker', 'run', '-d', '-t', '-p', str(port) + ':22', '--name', name, '--mount', 'type=bind,source=' + source_dir + ',target=/tmp/nni', image] output = check_output(run_cmds) commit_id = output.decode('utf-8') From 7b7cadc429817399d8dbebe604c030bed2577da6 Mon Sep 17 00:00:00 2001 From: Shinai Yang Date: Thu, 13 Aug 2020 12:21:04 +0800 Subject: [PATCH 18/18] fix remote pipeline --- test/nni_test/nnitest/remote_docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/nni_test/nnitest/remote_docker.py b/test/nni_test/nnitest/remote_docker.py index 0f17688410..2c89c34374 100644 --- a/test/nni_test/nnitest/remote_docker.py +++ b/test/nni_test/nnitest/remote_docker.py @@ -57,7 +57,7 @@ def get_dist(wheel_name): else: return '/tmp/nni/dist/{0}'.format(wheel_name) - pip_cmds = ['docker', 'exec', name, 'python3', '-m', 'pip', 'install', '--upgrade', 'pip', 'setuptools==39.1.0'] + pip_cmds = ['docker', 'exec', name, 'python3', '-m', 'pip', 'install', '--upgrade', 'pip', 'setuptools==41.0.0'] check_call(pip_cmds) sdk_cmds = ['docker', 'exec', name, 'python3', '-m', 'pip', 'install', get_dist(wheel_name)] check_call(sdk_cmds)