summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-01 14:03:42 +0000
committerGerrit Code Review <review@openstack.org>2019-01-01 14:03:42 +0000
commit7d3ad9a7aa0f1bebf54ece9ec390948e8e16b3c2 (patch)
treed48a912d51cf6deaea0bc3807700e668db767ed8
parent0372d3a87282fd2dca572368a1c904c09b38ebdc (diff)
parent9d7562ad37a08fac9c8a4b2c48d1e2cf3a21a849 (diff)
Merge "Fix container job documentation typo"
-rw-r--r--doc/source/user/jobs.rst4
-rw-r--r--tests/fixtures/config/container-build-resources/git/common-config/playbooks/container-machine.yaml2
-rw-r--r--tests/fixtures/config/container-build-resources/git/common-config/playbooks/container-native.yaml2
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/user/jobs.rst b/doc/source/user/jobs.rst
index 4322eef..af947dd 100644
--- a/doc/source/user/jobs.rst
+++ b/doc/source/user/jobs.rst
@@ -463,7 +463,7 @@ of item.
463 - hosts: localhost 463 - hosts: localhost
464 tasks: 464 tasks:
465 - name: Create a k8s resource 465 - name: Create a k8s resource
466 k8s_raw: 466 k8s_raw:
467 state: present 467 state: present
468 context: "{{ zuul.resources['node-name'].context }}" 468 context: "{{ zuul.resources['node-name'].context }}"
469 namespace: "{{ zuul.resources['node-name'].namespace }}" 469 namespace: "{{ zuul.resources['node-name'].namespace }}"
@@ -475,7 +475,7 @@ of item.
475 - hosts: localhost 475 - hosts: localhost
476 tasks: 476 tasks:
477 - name: Copy src repos to the pod 477 - name: Copy src repos to the pod
478 command: > 478 command: >
479 oc rsync -q --progress=false 479 oc rsync -q --progress=false
480 {{ zuul.executor.src_root }}/ 480 {{ zuul.executor.src_root }}/
481 {{ zuul.resources['node-name'].pod }}:src/ 481 {{ zuul.resources['node-name'].pod }}:src/
diff --git a/tests/fixtures/config/container-build-resources/git/common-config/playbooks/container-machine.yaml b/tests/fixtures/config/container-build-resources/git/common-config/playbooks/container-machine.yaml
index 0cb21d8..67089bb 100644
--- a/tests/fixtures/config/container-build-resources/git/common-config/playbooks/container-machine.yaml
+++ b/tests/fixtures/config/container-build-resources/git/common-config/playbooks/container-machine.yaml
@@ -1,6 +1,6 @@
1- hosts: localhost 1- hosts: localhost
2 tasks: 2 tasks:
3 # We except a namespace, a context and a pod name 3 # We expect a namespace, a context and a pod name
4 - assert: 4 - assert:
5 that: 5 that:
6 - zuul.resources.container.namespace == 'zuul-ci-abcdefg' 6 - zuul.resources.container.namespace == 'zuul-ci-abcdefg'
diff --git a/tests/fixtures/config/container-build-resources/git/common-config/playbooks/container-native.yaml b/tests/fixtures/config/container-build-resources/git/common-config/playbooks/container-native.yaml
index 121f22e..e3ec230 100644
--- a/tests/fixtures/config/container-build-resources/git/common-config/playbooks/container-native.yaml
+++ b/tests/fixtures/config/container-build-resources/git/common-config/playbooks/container-native.yaml
@@ -1,6 +1,6 @@
1- hosts: localhost 1- hosts: localhost
2 tasks: 2 tasks:
3 # We except a namespace and a context 3 # We expect a namespace and a context
4 - assert: 4 - assert:
5 that: 5 that:
6 - zuul.resources.cluster1.namespace == 'zuul-ci-abcdefg' 6 - zuul.resources.cluster1.namespace == 'zuul-ci-abcdefg'