Skip to content
This repository has been archived by the owner on Sep 18, 2021. It is now read-only.

Commit

Permalink
Merge pull request #8 from jaypoulz/dev-v1.0
Browse files Browse the repository at this point in the history
Cosmetic updates and error cleanup.
  • Loading branch information
jaypoulz authored May 23, 2018
2 parents ceb3972 + 3096229 commit db6320b
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 32 deletions.
22 changes: 11 additions & 11 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ library(
)

List arches = params.ARCHES.tokenize(',')
def errorMessages = ''
def config = TestUtils.getProvisioningConfig(this)

TestUtils.runParallelMultiArchTest(
Expand All @@ -60,18 +61,16 @@ TestUtils.runParallelMultiArchTest(
/* TEST BODY */
/* @param host Provisioned host details. */
/*********************************************************/
dir('test') {
stage ('Download Test Files') {
downloadTests()
}
stage ('Download Test Files') {
downloadTests()
}

stage ('Run Test') {
runTests(config, host)
}
stage ('Run Test') {
runTests(config, host)
}

stage ('Archive Test Output') {
archiveOutput()
}
stage ('Archive Test Output') {
archiveOutput()
}

/*****************************************************************/
Expand All @@ -80,7 +79,8 @@ TestUtils.runParallelMultiArchTest(
/*****************************************************************/
},
{ Exception exception, def host ->
echo "Exception ${exception} occured on ${host.arch}"
def error = "Exception ${exception} occured on ${host.arch}\n"
errorMessages += error
if (host.arch.equals("x86_64") || host.arch.equals("ppc64le")) {
currentBuild.result = 'FAILURE'
}
Expand Down
20 changes: 0 additions & 20 deletions tests/ansible-playbooks/example-test/playbook.yml

This file was deleted.

20 changes: 20 additions & 0 deletions tests/ansible-playbooks/host-summary/playbook.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
- name: Host Summary
hosts: all
gather_facts: true

tasks:
- debug: msg="{{ playbook_dir }}"

- name: Create output directory
file: path="{{ playbook_dir}}/artifacts/host-summary" state=directory mode=0755

- template:
src: "{{ playbook_dir }}/templates/host-summary.j2"
dest: "{{ playbook_dir }}/artifacts/host-summary/{{ ansible_architecture }}.txt"
mode: 0644

- fetch:
src: "{{ playbook_dir }}/artifacts/host-summary/{{ ansible_architecture }}.txt"
dest: "{{ playbook_dir }}/artifacts/host-summary/{{ ansible_architecture }}.txt"
flat: yes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Subject: Example Test [System Architecture="{{ ansible_architecture }}"]
Subject: Host Summary [System Architecture="{{ ansible_architecture }}"]

Report Date: "{{ansible_date_time.date}}"

Expand Down

0 comments on commit db6320b

Please sign in to comment.