From d1d32ada00e7497118bafeb14c08efcb363e2d37 Mon Sep 17 00:00:00 2001
From: Austin Shalit <austinshalit@gmail.com>
Date: Sun, 5 Apr 2020 23:05:13 -0700
Subject: [PATCH] [build] Fix artifact publishing (#2471)

Add back variables block that was removed in #2457.
---
 azure-pipelines.yml               |  5 +++++
 azure-templates/stage-combine.yml | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 305af7d709..e4590ba721 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -11,6 +11,9 @@ resources:
   - container: ubuntu
     image:  wpilib/ubuntu-base:18.04
 
+variables:
+- group: Artifactory-Package-Publish
+
 trigger:
   batch: true
   branches:
@@ -67,4 +70,6 @@ stages:
 - template: azure-templates/stage-combine.yml
   parameters:
     publish: True
+    publishUserName: $(PublishUserName)
+    publishPassword: $(PublishPassword)
     artifacts: [Mac, Win32, Win64, Linux, Raspbian, Athena, Aarch64]
diff --git a/azure-templates/stage-combine.yml b/azure-templates/stage-combine.yml
index a8648627a6..1e1d741886 100644
--- a/azure-templates/stage-combine.yml
+++ b/azure-templates/stage-combine.yml
@@ -2,6 +2,8 @@
 
 parameters:
   publish: False
+  publishUserName: ''
+  publishPassword: ''
   artifacts: []
 
 stages:
@@ -48,8 +50,8 @@ stages:
           options: '-Pallwpilib'
         env:
           RUN_AZURE_ARTIFACTORY_RELEASE: 'TRUE'
-          ARTIFACTORY_PUBLISH_USERNAME: $(PublishUserName)
-          ARTIFACTORY_PUBLISH_PASSWORD: $(PublishPassword)
+          ARTIFACTORY_PUBLISH_USERNAME: $(publishUserName)
+          ARTIFACTORY_PUBLISH_PASSWORD: $(publishPassword)
 
 # Tagged Builds
       - ${{ if and(parameters.publish, startsWith(variables['Build.SourceBranch'], 'refs/tags/v')) }}:
@@ -62,8 +64,8 @@ stages:
             options: '-Pallwpilib -PreleaseRepoPublish'
           env:
             RUN_AZURE_ARTIFACTORY_RELEASE: 'TRUE'
-            ARTIFACTORY_PUBLISH_USERNAME: $(PublishUserName)
-            ARTIFACTORY_PUBLISH_PASSWORD: $(PublishPassword)
+            ARTIFACTORY_PUBLISH_USERNAME: $(publishUserName)
+            ARTIFACTORY_PUBLISH_PASSWORD: $(publishPassword)
 
     - script: |
         echo "##vso[task.setvariable variable=UserHome]$HOME"