From 72b7822b49125d84e4a27cb68cd14cd1e4bb1716 Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 17:46:26 -0500 Subject: [PATCH 01/14] Update azure-pipelines-v2.yml --- .ci/azure-pipelines-v2.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.ci/azure-pipelines-v2.yml b/.ci/azure-pipelines-v2.yml index 2d1540e..e3468f0 100644 --- a/.ci/azure-pipelines-v2.yml +++ b/.ci/azure-pipelines-v2.yml @@ -14,6 +14,10 @@ resources: - repository: aitemplates type: github name: microsoft/AI + endpoint: AIArchitecturesAndPractices-GitHub + - repository: r-azure-pipelines + type: github + name: r-lib/r-azure-pipelines endpoint: AIArchitecturesAndPractices-GitHub trigger: @@ -35,3 +39,6 @@ stages: jobDisplayName: RMLAKSDeployAMLJob DefaultWorkingDirectory: $(System.DefaultWorkingDirectory) workload_vars: ../vars/rml_realtime_scoring.yml +- stage: test + jobs: + - template: azure-tidyverse.yml@r-azure-pipeline From 9e1ba6d352676ae978471a2d56f22987f3e8269a Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 17:48:02 -0500 Subject: [PATCH 02/14] Update azure-pipelines-v2.yml for Azure Pipelines --- .ci/azure-pipelines-v2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/azure-pipelines-v2.yml b/.ci/azure-pipelines-v2.yml index e3468f0..3cf9ee8 100644 --- a/.ci/azure-pipelines-v2.yml +++ b/.ci/azure-pipelines-v2.yml @@ -15,7 +15,7 @@ resources: type: github name: microsoft/AI endpoint: AIArchitecturesAndPractices-GitHub - - repository: r-azure-pipelines + - repository: razurepipelines type: github name: r-lib/r-azure-pipelines endpoint: AIArchitecturesAndPractices-GitHub @@ -41,4 +41,4 @@ stages: workload_vars: ../vars/rml_realtime_scoring.yml - stage: test jobs: - - template: azure-tidyverse.yml@r-azure-pipeline + - template: azure-tidyverse.yml@razurepipelines From d9ecabd1682fbaf8b27d1e300974c7af8985bb1f Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 17:48:34 -0500 Subject: [PATCH 03/14] Update azure-pipelines-v2.yml for Azure Pipelines --- .ci/azure-pipelines-v2.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.ci/azure-pipelines-v2.yml b/.ci/azure-pipelines-v2.yml index 3cf9ee8..69d8209 100644 --- a/.ci/azure-pipelines-v2.yml +++ b/.ci/azure-pipelines-v2.yml @@ -33,12 +33,13 @@ pr: - master stages: +- stage: test + jobs: + - template: azure-tidyverse.yml@razurepipelines + - template: .ci/stages/deploy_notebooks_stages_v2.yml@aitemplates parameters: Agent: $(Agent_Name) jobDisplayName: RMLAKSDeployAMLJob DefaultWorkingDirectory: $(System.DefaultWorkingDirectory) - workload_vars: ../vars/rml_realtime_scoring.yml -- stage: test - jobs: - - template: azure-tidyverse.yml@razurepipelines + workload_vars: ../vars/rml_realtime_scoring.yml \ No newline at end of file From ef6e68025af83681ecd9a59346c58afcf3df42c7 Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 17:51:17 -0500 Subject: [PATCH 04/14] Create DESCRIPTION --- DESCRIPTION | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 DESCRIPTION diff --git a/DESCRIPTION b/DESCRIPTION new file mode 100644 index 0000000..430cf21 --- /dev/null +++ b/DESCRIPTION @@ -0,0 +1,22 @@ +Package: azuretest +Title: Test package for azure pipelines +Version: 0.0.0.9000 +Authors@R: + c(person(given = "Jim", + family = "Hester", + role = c("aut", "cre"), + email = "james.f.hester@gmail.com", + comment = c(ORCID = "0000-0002-2739-7082")), + person(given = "RStudio", + role = c("cph", "fnd"))) +Description: What the package does (one paragraph). +License: MIT + file LICENSE +Encoding: UTF-8 +LazyData: true +Suggests: + testthat (>= 2.1.0), + xml2, + covr +URL: https://github.com/jimhester/azuretest +BugReports: https://github.com/jimhester/azuretest/issues +RoxygenNote: 6.1.1 From 2583ef97d85aeeb8a217b3876af77d2956d5b274 Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 17:56:27 -0500 Subject: [PATCH 05/14] Create setup.R --- setup.R | 1 + 1 file changed, 1 insertion(+) create mode 100644 setup.R diff --git a/setup.R b/setup.R new file mode 100644 index 0000000..c06956b --- /dev/null +++ b/setup.R @@ -0,0 +1 @@ +install.packages("AzureGraph") From 0b35d98ae7dbfbff54240be3957f5dcbfac673c5 Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 17:57:27 -0500 Subject: [PATCH 06/14] Update azure-pipelines-v2.yml for Azure Pipelines --- .ci/azure-pipelines-v2.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.ci/azure-pipelines-v2.yml b/.ci/azure-pipelines-v2.yml index 69d8209..bbc87ca 100644 --- a/.ci/azure-pipelines-v2.yml +++ b/.ci/azure-pipelines-v2.yml @@ -15,10 +15,6 @@ resources: type: github name: microsoft/AI endpoint: AIArchitecturesAndPractices-GitHub - - repository: razurepipelines - type: github - name: r-lib/r-azure-pipelines - endpoint: AIArchitecturesAndPractices-GitHub trigger: batch: true @@ -33,10 +29,6 @@ pr: - master stages: -- stage: test - jobs: - - template: azure-tidyverse.yml@razurepipelines - - template: .ci/stages/deploy_notebooks_stages_v2.yml@aitemplates parameters: Agent: $(Agent_Name) From 245261e072bbf58870bf0e805209f89a639d45ab Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 18:06:23 -0500 Subject: [PATCH 07/14] Update azure-pipelines-v2.yml for Azure Pipelines --- .ci/azure-pipelines-v2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/azure-pipelines-v2.yml b/.ci/azure-pipelines-v2.yml index bbc87ca..f1f026f 100644 --- a/.ci/azure-pipelines-v2.yml +++ b/.ci/azure-pipelines-v2.yml @@ -29,7 +29,7 @@ pr: - master stages: -- template: .ci/stages/deploy_notebooks_stages_v2.yml@aitemplates +- template: .ci/stages/deploy_container_stages_v2.yml@aitemplates parameters: Agent: $(Agent_Name) jobDisplayName: RMLAKSDeployAMLJob From e05dae1e71eab3c5f9c62344b5b733a730c6d64d Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 19:04:58 -0500 Subject: [PATCH 08/14] Update azure-pipelines-v2.yml for Azure Pipelines --- .ci/azure-pipelines-v2.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/azure-pipelines-v2.yml b/.ci/azure-pipelines-v2.yml index f1f026f..11bfafc 100644 --- a/.ci/azure-pipelines-v2.yml +++ b/.ci/azure-pipelines-v2.yml @@ -34,4 +34,5 @@ stages: Agent: $(Agent_Name) jobDisplayName: RMLAKSDeployAMLJob DefaultWorkingDirectory: $(System.DefaultWorkingDirectory) - workload_vars: ../vars/rml_realtime_scoring.yml \ No newline at end of file + workload_vars: ../vars/rml_realtime_scoring.yml + sp_password: $(sp_password) \ No newline at end of file From f76ba861fe0003b2eccd0762e65b7ca04e8e0dd0 Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 19:12:00 -0500 Subject: [PATCH 09/14] Delete setup.R --- setup.R | 1 - 1 file changed, 1 deletion(-) delete mode 100644 setup.R diff --git a/setup.R b/setup.R deleted file mode 100644 index c06956b..0000000 --- a/setup.R +++ /dev/null @@ -1 +0,0 @@ -install.packages("AzureGraph") From a0b5bffaaf18d0aeeed22c16ff00879fd68e9ab2 Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 19:12:09 -0500 Subject: [PATCH 10/14] Delete DESCRIPTION --- DESCRIPTION | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 DESCRIPTION diff --git a/DESCRIPTION b/DESCRIPTION deleted file mode 100644 index 430cf21..0000000 --- a/DESCRIPTION +++ /dev/null @@ -1,22 +0,0 @@ -Package: azuretest -Title: Test package for azure pipelines -Version: 0.0.0.9000 -Authors@R: - c(person(given = "Jim", - family = "Hester", - role = c("aut", "cre"), - email = "james.f.hester@gmail.com", - comment = c(ORCID = "0000-0002-2739-7082")), - person(given = "RStudio", - role = c("cph", "fnd"))) -Description: What the package does (one paragraph). -License: MIT + file LICENSE -Encoding: UTF-8 -LazyData: true -Suggests: - testthat (>= 2.1.0), - xml2, - covr -URL: https://github.com/jimhester/azuretest -BugReports: https://github.com/jimhester/azuretest/issues -RoxygenNote: 6.1.1 From 631f78abc07ae98d6b1e1b7a8894e5a44a06ffaa Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 19:25:01 -0500 Subject: [PATCH 11/14] Update 01_create_resources.R --- 01_create_resources.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/01_create_resources.R b/01_create_resources.R index 6a70f35..8490a49 100644 --- a/01_create_resources.R +++ b/01_create_resources.R @@ -9,11 +9,11 @@ source("resource_specs.R") # create ARM and Graph logins az <- try(get_azure_login(tenant), silent=TRUE) if(inherits(az, "try-error")) - az <- create_azure_login(tenant, auth_type="device_code") + az <- create_azure_login(tenant, app=app_id, password=password) gr <- try(get_graph_login(tenant), silent=TRUE) if(inherits(gr, "try-error")) - gr <- create_graph_login(tenant, auth_type="device_code") + gr <- create_graph_login(tenant, app=app_id, password=password) sub <- az$get_subscription(sub_id) From 2bfd7a1e276fa83da6ae967bedd93a27b7e74dec Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 19:31:35 -0500 Subject: [PATCH 12/14] Update azure-pipelines-v2.yml for Azure Pipelines --- .ci/azure-pipelines-v2.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/azure-pipelines-v2.yml b/.ci/azure-pipelines-v2.yml index 11bfafc..256abe6 100644 --- a/.ci/azure-pipelines-v2.yml +++ b/.ci/azure-pipelines-v2.yml @@ -35,4 +35,5 @@ stages: jobDisplayName: RMLAKSDeployAMLJob DefaultWorkingDirectory: $(System.DefaultWorkingDirectory) workload_vars: ../vars/rml_realtime_scoring.yml + sp_appid: $(sp_appid) sp_password: $(sp_password) \ No newline at end of file From ace3c00ea9bb5c5b1b98e8be48f39f5c5c16ca82 Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 19:34:41 -0500 Subject: [PATCH 13/14] Update resource_specs.R --- resource_specs.R | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resource_specs.R b/resource_specs.R index 0d7d541..6d6ee06 100644 --- a/resource_specs.R +++ b/resource_specs.R @@ -31,6 +31,8 @@ email <- "your.email@tenant.com" # service username username <- "ml-model-user" +app_id <- "your ap id" + # service password password <- stop("Must specify a password!") From 74a381ba1e28a5f12d8e73ede46ae33de32ada0e Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Fri, 29 Nov 2019 19:36:23 -0500 Subject: [PATCH 14/14] Create DESCRIPTION --- DESCRIPTION | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 DESCRIPTION diff --git a/DESCRIPTION b/DESCRIPTION new file mode 100644 index 0000000..908cfc4 --- /dev/null +++ b/DESCRIPTION @@ -0,0 +1,22 @@ +Package: realtimeRDeployment +Title: Deploy Real Time R Service +Version: 0.0.0.0 +Authors@R: + c(person(given = "Hong", + family = "Ooi", + role = c("aut", "cre"), + email = "hongooi@microsoft.com", + comment = c(ORCID = "0000-0002-2739-7082")), + person(given = "RStudio", + role = c("cph", "fnd"))) +Description: What the package does (one paragraph). +License: MIT + file LICENSE +Encoding: UTF-8 +LazyData: true +Suggests: + testthat (>= 2.1.0), + xml2, + covr +URL: https://github.com/Azure/RealtimeRDeployment +BugReports: https://github.com/Azure/RealtimeRDeployment/issues +RoxygenNote: 6.1.1