diff options
| author | Luke Meyer <lmeyer@redhat.com> | 2017-04-04 12:05:20 -0400 |
|---|---|---|
| committer | Luke Meyer <lmeyer@redhat.com> | 2017-04-25 12:17:38 -0400 |
| commit | e5f14b515b07bcfa2079c3e68c35fee3e97970c7 (patch) | |
| tree | 2f3cd2749ead0f19659b46d28f03114a58f803b3 /test/integration/openshift_health_checker | |
| parent | ce4c2f0cc0b4766eff28f5fa91eb353301ad9c91 (diff) | |
| download | openshift-e5f14b515b07bcfa2079c3e68c35fee3e97970c7.tar.gz openshift-e5f14b515b07bcfa2079c3e68c35fee3e97970c7.tar.bz2 openshift-e5f14b515b07bcfa2079c3e68c35fee3e97970c7.tar.xz openshift-e5f14b515b07bcfa2079c3e68c35fee3e97970c7.zip | |
integration tests: add CI scripts
Add some scripts that can be run from Jenkins to build/push test images
and to run the tests.
Updated README to expand on running tests.
Diffstat (limited to 'test/integration/openshift_health_checker')
| -rw-r--r-- | test/integration/openshift_health_checker/builds/build-container-images.yml | 19 | ||||
| -rw-r--r-- | test/integration/openshift_health_checker/builds/test-target-base/Dockerfile (renamed from test/integration/openshift_health_checker/builds/Dockerfile.test-target-base) | 0 | ||||
| -rw-r--r-- | test/integration/openshift_health_checker/common.go | 2 | ||||
| -rw-r--r-- | test/integration/openshift_health_checker/setup_container.yml | 2 |
4 files changed, 2 insertions, 21 deletions
diff --git a/test/integration/openshift_health_checker/builds/build-container-images.yml b/test/integration/openshift_health_checker/builds/build-container-images.yml deleted file mode 100644 index 445d73d29..000000000 --- a/test/integration/openshift_health_checker/builds/build-container-images.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- name: Build all the images we need for running integration tests - hosts: localhost - connection: local - tasks: - - - name: test-target-base - docker_image: - state: present - path: ./ - dockerfile: Dockerfile.test-target-base - name: test-target-base - - - name: preflight-aos-package-checks - docker_image: - state: present - pull: no - path: ./aos-package-checks - name: preflight-aos-package-checks diff --git a/test/integration/openshift_health_checker/builds/Dockerfile.test-target-base b/test/integration/openshift_health_checker/builds/test-target-base/Dockerfile index 39b33c057..39b33c057 100644 --- a/test/integration/openshift_health_checker/builds/Dockerfile.test-target-base +++ b/test/integration/openshift_health_checker/builds/test-target-base/Dockerfile diff --git a/test/integration/openshift_health_checker/common.go b/test/integration/openshift_health_checker/common.go index aea85342f..a92d6861d 100644 --- a/test/integration/openshift_health_checker/common.go +++ b/test/integration/openshift_health_checker/common.go @@ -25,7 +25,7 @@ func (p PlaybookTest) Run(t *testing.T) { // A PlaybookTest is intended to be run in parallel with other tests. t.Parallel() - cmd := exec.Command("ansible-playbook", p.Path) + cmd := exec.Command("ansible-playbook", "-i", "/dev/null", p.Path) cmd.Env = append(os.Environ(), "ANSIBLE_FORCE_COLOR=1") b, err := cmd.CombinedOutput() diff --git a/test/integration/openshift_health_checker/setup_container.yml b/test/integration/openshift_health_checker/setup_container.yml index 4dd2c4b1e..8793d954e 100644 --- a/test/integration/openshift_health_checker/setup_container.yml +++ b/test/integration/openshift_health_checker/setup_container.yml @@ -23,7 +23,7 @@ - name: start container docker_container: name: "{{ container_name }}" - image: "{{ image | default('test-target-base') }}" + image: "{{ lookup('env', 'IMAGE_PREFIX') | default('openshift-ansible-integration-', true) }}{{ image | default('test-target-base') }}" command: "{{ command | default('sleep 1800') }}" recreate: yes # NOTE: When/if we need to run containers that are docker hosts as well: |