diff options
| -rw-r--r-- | azure-pipelines.yml | 16 | ||||
| -rwxr-xr-x | scripts/deploy-azure.sh | 5 |
2 files changed, 11 insertions, 10 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1077c802..52c1471d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,15 +1,11 @@ # https://aka.ms/yaml variables: - ENV LIBRARY_PATH: /lib:/usr/lib - ENV PIPENV_HIDE_EMOJIS: 1 - ENV PIPENV_IGNORE_VIRTUALENVS: 1 - ENV PIPENV_NOSPIN: 1 - ENV PIPENV_VENV_IN_PROJECT: 1 - ENV SALTAPI_EAUTH: pam - ENV SALTAPI_PASS: $(SALTAPI_PASS) - ENV SALTAPI_URL: $(SALTAPI_URL) - ENV SALTAPI_USER: $(SALTAPI_USER) + LIBRARY_PATH: /lib:/usr/lib + PIPENV_HIDE_EMOJIS: 1 + PIPENV_IGNORE_VIRTUALENVS: 1 + PIPENV_NOSPIN: 1 + PIPENV_VENV_IN_PROJECT: 1 jobs: - job: test @@ -69,4 +65,4 @@ jobs: inputs: scriptPath: scripts/deploy-azure.sh - args: '$(SALTAPI_TARGET)' + args: '$(SALTAPI_TARGET) $(SALTAPI_USER) $(SALTAPI_PASS) $(SALTAPI_URL) $(SALTAPI_EAUTH)' diff --git a/scripts/deploy-azure.sh b/scripts/deploy-azure.sh index 5a7f895e..47573879 100755 --- a/scripts/deploy-azure.sh +++ b/scripts/deploy-azure.sh @@ -2,6 +2,11 @@ cd .. +export SALTAPI_USER=$2 +export SALTAPI_PASS=$3 +export SALTAPI_URL=$4 +export SALTAPI_EAUTH=$5 + # Build and deploy on master branch, only if not a pull request if [[ ($BUILD_SOURCEBRANCHNAME == 'master') && ($SYSTEM_PULLREQUEST_PULLREQUESTID == '') ]]; then echo "Building image" |