zuul
/
zuul
Code Issues Proposed changes

Merge "Fix container job documentation typo"

This commit is contained in:
Zuul 2019-01-01 14:03:42 +00:00 committed by Gerrit Code Review
parent 0372d3a872 9d7562ad37
commit 7d3ad9a7aa
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/user/jobs.rst
View File

@ -463,7 +463,7 @@ of item.
- hosts: localhost - hosts: localhost
tasks: tasks:
- name: Create a k8s resource - name: Create a k8s resource
k8s_raw: k8s_raw:
state: present state: present
context: "{{ zuul.resources['node-name'].context }}" context: "{{ zuul.resources['node-name'].context }}"
namespace: "{{ zuul.resources['node-name'].namespace }}" namespace: "{{ zuul.resources['node-name'].namespace }}"
@ -475,7 +475,7 @@ of item.
- hosts: localhost - hosts: localhost
tasks: tasks:
- name: Copy src repos to the pod - name: Copy src repos to the pod
command: > command: >
oc rsync -q --progress=false oc rsync -q --progress=false
{{ zuul.executor.src_root }}/ {{ zuul.executor.src_root }}/
{{ zuul.resources['node-name'].pod }}:src/ {{ zuul.resources['node-name'].pod }}:src/

2
tests/fixtures/config/container-build-resources/git/common-config/playbooks/container-machine.yaml vendored
View File

@ -1,6 +1,6 @@
- hosts: localhost - hosts: localhost
tasks: tasks:
# We except a namespace, a context and a pod name # We expect a namespace, a context and a pod name
- assert: - assert:
that: that:
- zuul.resources.container.namespace == 'zuul-ci-abcdefg' - zuul.resources.container.namespace == 'zuul-ci-abcdefg'

2
tests/fixtures/config/container-build-resources/git/common-config/playbooks/container-native.yaml vendored
View File

@ -1,6 +1,6 @@
- hosts: localhost - hosts: localhost
tasks: tasks:
# We except a namespace and a context # We expect a namespace and a context
- assert: - assert:
that: that:
- zuul.resources.cluster1.namespace == 'zuul-ci-abcdefg' - zuul.resources.cluster1.namespace == 'zuul-ci-abcdefg'