Merge pull request #108 from migs/master

Add BBL customisations

Author: rigoford

ci/pipeline.yml

@@ -18,7 +18,7 @@ resources:
   type: git
   source:
     branch: master
-    uri: ((bbl-state-url))
+    uri: ((bbl-state.url))
     username: ((git-credentials.username))
     password: ((git-credentials.password))
 - name: bosh-bootloader
@@ -33,7 +33,12 @@ resources:
   source:
     branch: master
     uri: https://github.com/cloudfoundry/cf-deployment-concourse-tasks.git
-- name: devtools-boshrelease
+- name: concourse-tasks
+  type: git 
+  source:
+    branch: master
+    uri: https://github.com/garethjevans/concourse-tasks.git
+  - name: devtools-boshrelease
   type: git
   source:
     <<: &devtools-boshrelease-git-source
@@ -101,8 +106,30 @@ jobs:
     - get: bbl-state
     - get: bosh-bootloader
     - get: cf-deployment-concourse-tasks
+    - get: concourse-tasks
     - get: devtools-boshrelease
       trigger: true
+    - get: devtools-boshrelease-ci
+      trigger: true
+  - task: customise-terraform
+    file: concourse-tasks/tasks/customise-deployment/task.yml
+    params:
+      GIT_COMMIT_USERNAME: ((bbl-state.username))
+      GIT_COMMIT_EMAIL: ((bbl-state.email))
+      TERRAFORM_CUSTOMISATIONS: |
+        ci/terraform/test-jenkins.tf
+        ci/terraform/test-gerrit.tf
+        ci/terraform/test-nexus.tf
+        ci/etrraform/test-sonarqube.tf
+    input_mapping:
+      env-repo: bbl-state
+      terraform-customisations: devtools-boshrelease-ci
+      cloud-config-customisations: devtools-boshrelease-ci
+    ensure:
+      put: bbl-state
+      params:
+        repository: updated-env-repo
+        rebase: true
   - task: bbl-up
     file: cf-deployment-concourse-tasks/bbl-up/task.yml
     input_mapping:

ci/terraform/test-gerrit.tf

@@ -0,0 +1,13 @@
+resource "google_compute_firewall" "jumpbox-to-gerrit" {
+  name    = "${var.env_id}-jumpbox-to-gerrit"
+  network = "${google_compute_network.bbl-network.name}"
+
+  source_tags = ["${var.env_id}-jumpbox"]
+
+  allow {
+    ports    = ["8080"]
+    protocol = "tcp"
+  }
+
+  target_tags = ["${var.env_id}-internal", "${var.env_id}-bosh-director"]
+}

ci/terraform/test-jenkins.tf

@@ -0,0 +1,13 @@
+resource "google_compute_firewall" "jumpbox-to-jenkins" {
+  name    = "${var.env_id}-jumpbox-to-jenkins"
+  network = "${google_compute_network.bbl-network.name}"
+
+  source_tags = ["${var.env_id}-jumpbox"]
+
+  allow {
+    ports    = ["8080"]
+    protocol = "tcp"
+  }
+
+  target_tags = ["${var.env_id}-internal", "${var.env_id}-bosh-director"]
+}

ci/terraform/test-nexus.tf

@@ -0,0 +1,13 @@
+resource "google_compute_firewall" "jumpbox-to-gerrit" {
+  name    = "${var.env_id}-jumpbox-to-gerrit"
+  network = "${google_compute_network.bbl-network.name}"
+
+  source_tags = ["${var.env_id}-jumpbox"]
+
+  allow {
+    ports    = ["8081"]
+    protocol = "tcp"
+  }
+
+  target_tags = ["${var.env_id}-internal", "${var.env_id}-bosh-director"]
+}

ci/terraform/test-sonarqube.tf

@@ -0,0 +1,13 @@
+resource "google_compute_firewall" "jumpbox-to-sonarqube" {
+  name    = "${var.env_id}-jumpbox-to-sonarqube"
+  network = "${google_compute_network.bbl-network.name}"
+
+  source_tags = ["${var.env_id}-jumpbox"]
+
+  allow {
+    ports    = ["9000"]
+    protocol = "tcp"
+  }
+
+  target_tags = ["${var.env_id}-internal", "${var.env_id}-bosh-director"]
+}