Skip to content

Commit 7aa99dd

Browse files
committed
azure-pipelines: properly expand negotiate passwords
To allow testing against a Kerberos instance, we have added variables for the Kerberos password to allow authentication against LIBGIT2.ORG in commit e5fb5fe (ci: perform SPNEGO tests, 2019-10-20). To set up the password, we assign "GITTEST_NEGOTIATE_PASSWORD=$(GITTEST_NEGOTIATE_PASSWORD)" in the environmentVariables section which is then passed through to a template. As the template does build-time expansion of the environment variables, it will expand the above line verbosely, and due to the envVar section not doing any further expansion the password variable will end up with the value "$(GITTEST_NEGOTIATE_PASSWORD)" in the container's environment. Fix this fixed by doing expansion of GITTEST_NEGOTIATE_PASSWORD at build-time, as well.
1 parent aa4cd77 commit 7aa99dd

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

azure-pipelines.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
CC=gcc
2121
CMAKE_GENERATOR=Ninja
2222
CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DVALGRIND=on -DUSE_GSSAPI=ON
23-
GITTEST_NEGOTIATE_PASSWORD=$(GITTEST_NEGOTIATE_PASSWORD)
23+
GITTEST_NEGOTIATE_PASSWORD=${{ variables.GITTEST_NEGOTIATE_PASSWORD }}
2424
2525
- job: linux_amd64_xenial_gcc_mbedtls
2626
displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)'
@@ -36,7 +36,7 @@ jobs:
3636
CC=gcc
3737
CMAKE_GENERATOR=Ninja
3838
CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DVALGRIND=on -DUSE_GSSAPI=ON
39-
GITTEST_NEGOTIATE_PASSWORD=$(GITTEST_NEGOTIATE_PASSWORD)
39+
GITTEST_NEGOTIATE_PASSWORD=${{ variables.GITTEST_NEGOTIATE_PASSWORD }}
4040
4141
- job: linux_amd64_xenial_clang_openssl
4242
displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)'
@@ -52,7 +52,7 @@ jobs:
5252
CC=clang
5353
CMAKE_GENERATOR=Ninja
5454
CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DVALGRIND=on -DUSE_GSSAPI=ON
55-
GITTEST_NEGOTIATE_PASSWORD=$(GITTEST_NEGOTIATE_PASSWORD)
55+
GITTEST_NEGOTIATE_PASSWORD=${{ variables.GITTEST_NEGOTIATE_PASSWORD }}
5656
5757
- job: linux_amd64_xenial_clang_mbedtls
5858
displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)'
@@ -68,7 +68,7 @@ jobs:
6868
CC=clang
6969
CMAKE_GENERATOR=Ninja
7070
CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DVALGRIND=on -DUSE_GSSAPI=ON
71-
GITTEST_NEGOTIATE_PASSWORD=$(GITTEST_NEGOTIATE_PASSWORD)
71+
GITTEST_NEGOTIATE_PASSWORD=${{ variables.GITTEST_NEGOTIATE_PASSWORD }}
7272
7373
- job: macos
7474
displayName: 'macOS'
@@ -85,7 +85,7 @@ jobs:
8585
CMAKE_GENERATOR: Ninja
8686
CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON
8787
SKIP_SSH_TESTS: true
88-
GITTEST_NEGOTIATE_PASSWORD: $(GITTEST_NEGOTIATE_PASSWORD)
88+
GITTEST_NEGOTIATE_PASSWORD: ${{ variables.GITTEST_NEGOTIATE_PASSWORD }}
8989

9090
- job: windows_vs_amd64
9191
displayName: 'Windows (amd64; Visual Studio)'

0 commit comments

Comments
 (0)