ITOPSENG-101 fix merge conflict

This commit is contained in:
Brett Meehan
2019-11-14 14:16:03 +11:00
7 changed files with 119 additions and 38 deletions

View File

@@ -34,7 +34,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 1
- step:
name: Molecule Test Batch - 2
services:
@@ -42,7 +42,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 2
- step:
name: Molecule Test Batch - 3
services:
@@ -50,7 +50,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 3
- step:
name: Molecule Test Batch - 4
services:
@@ -58,7 +58,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 4
- step:
name: Molecule Test Batch - 5
services:
@@ -66,7 +66,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 5
- step:
name: Molecule Test Batch - 6
services:
@@ -74,7 +74,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 6
- step:
name: Molecule Test Batch - 7
services:
@@ -82,7 +82,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 7
- step:
name: Molecule Test Batch - 8
services:
@@ -90,7 +90,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 8
- step:
name: Molecule Test Batch - 9
services:
@@ -98,7 +98,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 9
- step:
name: Molecule Test Batch - 10
services:
@@ -106,7 +106,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 10
- step:
name: Molecule Test Batch - 11
services:
@@ -114,7 +114,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 11
- step:
name: Molecule Test Batch - 12
services:
@@ -122,7 +122,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 12
- step:
name: Molecule Test Batch - 13
services:
@@ -130,7 +130,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 13
- step:
name: Molecule Test Batch - 14
services:
@@ -138,7 +138,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 14
- step:
name: Molecule Test Batch - 15
services:
@@ -146,7 +146,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 15
- step:
name: Molecule Test Batch - 16
services:
@@ -154,7 +154,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 16
- step:
name: Molecule Test Batch - 17
services:
@@ -162,7 +162,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 17
- step:
name: Molecule Test Batch - 18
services:
@@ -170,7 +170,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 18
- step:
name: Molecule Test Batch - 19
services:
@@ -178,7 +178,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 19
- step:
name: Molecule Test Batch - 20
services:
@@ -186,7 +186,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 20
- step:
name: Molecule Test Batch - 21
services:
@@ -194,7 +194,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 21
- step:
name: Molecule Test Batch - 22
services:
@@ -202,7 +202,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 22
- step:
name: Molecule Test Batch - 23
services:
@@ -210,7 +210,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 23
- step:
name: Molecule Test Batch - 24
services:
@@ -218,7 +218,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 24
- step:
name: Molecule Test Batch - 25
services:
@@ -226,7 +226,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 25
- step:
name: Molecule Test Batch - 26
services:
@@ -234,7 +234,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 26
- step:
name: Molecule Test Batch - 27
services:
@@ -242,7 +242,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 27
- step:
name: Molecule Test Batch - 28
services:
@@ -250,7 +250,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 28
- step:
name: Molecule Test Batch - 29
services:
@@ -258,7 +258,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 29
- step:
name: Molecule Test Batch - 30
services:
@@ -266,7 +266,7 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 30
- step:
name: Molecule Test Batch - 31
services:
@@ -274,5 +274,4 @@ pipelines:
script:
- apt-get update && ./bin/install-ansible --dev
- ./bin/run-tests-in-batches --batch 31