diff options
| author | Zuul <zuul@review.openstack.org> | 2018-09-22 16:14:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-09-22 16:14:29 +0000 |
| commit | 21d902a6334f2d7c4a82ea5cf8b6d9b0cb2b5eda (patch) | |
| tree | eb5deb210807884424ac6cfb63d8dbc718da2d25 /tests | |
| parent | ca688f6c2ac279e53a5f8c9b63bbbc6de535b414 (diff) | |
| parent | f3f2e3ea58de2cce3fb0a749326c498427474e88 (diff) | |
| download | python-jenkins-job-builder-21d902a6334f2d7c4a82ea5cf8b6d9b0cb2b5eda.tar.gz python-jenkins-job-builder-21d902a6334f2d7c4a82ea5cf8b6d9b0cb2b5eda.tar.xz python-jenkins-job-builder-21d902a6334f2d7c4a82ea5cf8b6d9b0cb2b5eda.zip | |
Merge "docker-container: Improve support for more options"
Diffstat (limited to 'tests')
4 files changed, 14 insertions, 0 deletions
diff --git a/tests/properties/fixtures/docker-container-full.xml b/tests/properties/fixtures/docker-container-full.xml index a5374675..36a67155 100644 --- a/tests/properties/fixtures/docker-container-full.xml +++ b/tests/properties/fixtures/docker-container-full.xml @@ -2,6 +2,10 @@ <project> <properties> <com.nirima.jenkins.plugins.docker.DockerJobProperty> + <registry plugin="docker-commons"> + <url>https://index.docker.io/v1/</url> + <credentialsId>71e4f29c-162b-40d0-85d9-3ddfba2911a0</credentialsId> + </registry> <tagOnCompletion>true</tagOnCompletion> <additionalTag>latest</additionalTag> <pushOnSuccess>true</pushOnSuccess> diff --git a/tests/properties/fixtures/docker-container-full.yaml b/tests/properties/fixtures/docker-container-full.yaml index b230e1bf..c188cedb 100644 --- a/tests/properties/fixtures/docker-container-full.yaml +++ b/tests/properties/fixtures/docker-container-full.yaml @@ -4,3 +4,5 @@ properties: additional-tag: latest push-on-success: true clean-local-images: true + docker-registry-url: https://index.docker.io/v1/ + credentials-id: 71e4f29c-162b-40d0-85d9-3ddfba2911a0 diff --git a/tests/properties/fixtures/docker-container-minimal.xml b/tests/properties/fixtures/docker-container-minimal.xml index 756a7cc7..ebb49d77 100644 --- a/tests/properties/fixtures/docker-container-minimal.xml +++ b/tests/properties/fixtures/docker-container-minimal.xml @@ -2,6 +2,10 @@ <project> <properties> <com.nirima.jenkins.plugins.docker.DockerJobProperty> + <registry plugin="docker-commons"> + <url/> + <credentialsId/> + </registry> <tagOnCompletion>false</tagOnCompletion> <additionalTag/> <pushOnSuccess>false</pushOnSuccess> diff --git a/tests/properties/fixtures/docker-container-nondefault.xml b/tests/properties/fixtures/docker-container-nondefault.xml index e6674661..d5e1d626 100644 --- a/tests/properties/fixtures/docker-container-nondefault.xml +++ b/tests/properties/fixtures/docker-container-nondefault.xml @@ -2,6 +2,10 @@ <project> <properties> <com.nirima.jenkins.plugins.docker.DockerJobProperty> + <registry plugin="docker-commons"> + <url/> + <credentialsId/> + </registry> <tagOnCompletion>true</tagOnCompletion> <additionalTag>my-hands-are-typing-words</additionalTag> <pushOnSuccess>true</pushOnSuccess> |