From 5e85f71ae8580c011da703d38e15a04f85eed8c6 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Fri, 4 Oct 2019 11:39:43 +1000 Subject: [PATCH] DCD-686: Update pipelines config. --- bin/install-ansible | 9 ++ bitbucket-pipelines.yml | 86 +++++++------------ pipeline_generator/Makefile | 2 +- pipeline_generator/pipeline.py | 5 +- .../templates/bitbucket-pipelines.yml.j2 | 4 +- 5 files changed, 43 insertions(+), 63 deletions(-) diff --git a/bin/install-ansible b/bin/install-ansible index ac95ed8..f94539d 100755 --- a/bin/install-ansible +++ b/bin/install-ansible @@ -12,3 +12,12 @@ fi ansible \ python-boto3 \ python-botocore + +if [[ $1 == "--dev" ]]; then + ./bin/pacapt install --noconfirm \ + python-dev python-pip \ + python3-dev python3-pip + + pip install pipenv + pipenv sync --dev +fi diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index a63c197..7cccd33 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -1,6 +1,6 @@ --- -image: atlassian/default-image:2 +image: ubuntu:disco options: size: 2x @@ -32,8 +32,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 1 - step: @@ -41,8 +40,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 2 - step: @@ -50,8 +48,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 3 - step: @@ -59,8 +56,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 4 - step: @@ -68,8 +64,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 5 - step: @@ -77,8 +72,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 6 - step: @@ -86,8 +80,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 7 - step: @@ -95,8 +88,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 8 - step: @@ -104,8 +96,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 9 - step: @@ -113,8 +104,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 10 - step: @@ -122,8 +112,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 11 - step: @@ -131,8 +120,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 12 - step: @@ -140,8 +128,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 13 - step: @@ -149,8 +136,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 14 - step: @@ -158,8 +144,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 15 - step: @@ -167,8 +152,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 16 - step: @@ -176,8 +160,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 17 - step: @@ -185,8 +168,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 18 - step: @@ -194,8 +176,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 19 - step: @@ -203,8 +184,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 20 - step: @@ -212,8 +192,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 21 - step: @@ -221,8 +200,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 22 - step: @@ -230,8 +208,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 23 - step: @@ -239,8 +216,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 24 - step: @@ -248,8 +224,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 25 - step: @@ -257,8 +232,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 26 - step: @@ -266,8 +240,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 27 - step: @@ -275,8 +248,7 @@ pipelines: services: - docker script: - - apt-get update && apt-get install -y virtualenv python-dev - - ./bin/install-ansible + - ./bin/install-ansible --dev - ./bin/run-tests-in-batches --batch 28 diff --git a/pipeline_generator/Makefile b/pipeline_generator/Makefile index 5b6e164..aed9280 100644 --- a/pipeline_generator/Makefile +++ b/pipeline_generator/Makefile @@ -1,2 +1,2 @@ generate-pipeline: - @python pipeline.py + @python3 pipeline.py diff --git a/pipeline_generator/pipeline.py b/pipeline_generator/pipeline.py index 62b1408..c225bbe 100644 --- a/pipeline_generator/pipeline.py +++ b/pipeline_generator/pipeline.py @@ -46,14 +46,13 @@ class Step: class ScriptCommand: - INSTALL_PACKAGES_COMMAND = "apt-get update && apt-get install -y virtualenv python-dev" - INSTALL_ANSIBLE_COMMAND = "./bin/install-ansible" + PACKAGE_INSTALL_COMMAND = "./bin/install-ansible --dev" def __init__(self, test_command): self.test_command = test_command def all_commands(self): - return [self.INSTALL_PACKAGES_COMMAND, self.INSTALL_ANSIBLE_COMMAND, self.test_command] + return [self.PACKAGE_INSTALL_COMMAND, self.test_command] def main(): diff --git a/pipeline_generator/templates/bitbucket-pipelines.yml.j2 b/pipeline_generator/templates/bitbucket-pipelines.yml.j2 index 9b7fe42..4432857 100644 --- a/pipeline_generator/templates/bitbucket-pipelines.yml.j2 +++ b/pipeline_generator/templates/bitbucket-pipelines.yml.j2 @@ -1,6 +1,6 @@ --- -image: atlassian/default-image:2 +image: ubuntu:disco options: size: 2x @@ -36,4 +36,4 @@ pipelines: {% for scriptCommand in parallel_step.scriptCommands -%} - {{ scriptCommand }} {% endfor %} - {% endfor %} \ No newline at end of file + {% endfor %}