Skip to content

Commit

Permalink
Cleanup Bosh Formulae
Browse files Browse the repository at this point in the history
- bosh-init is dead.  Long live bosh create-env!
- bosh2 is dead.  Long live bosh!
  • Loading branch information
jhunt committed Aug 22, 2018
1 parent b9e711a commit 5663f07
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 75 deletions.
21 changes: 0 additions & 21 deletions bosh-init.rb

This file was deleted.

6 changes: 3 additions & 3 deletions bosh2.rb → bosh.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require "FileUtils"

class Bosh2 < Formula
class Bosh < Formula
homepage "https://github.com/cloudfoundry/bosh-cli"

v = "v5.1.2" # CI Managed
Expand All @@ -12,10 +12,10 @@ class Bosh2 < Formula

def install
FileUtils.mv("bosh-cli-#{@@verNum}-darwin-amd64", "bosh2")
bin.install "bosh2"
bin.install "bosh"
end

test do
system "#{bin}/bosh2", "--version"
system "#{bin}/bosh", "--version"
end
end
60 changes: 9 additions & 51 deletions ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,8 @@ groups:
- gotcha-debian
- genesis-homebrew
- genesis-debian
- bosh2-homebrew
- bosh-homebrew
- bosh-cli-debian
- bosh-init-homebrew
- credhub-cli-debian
- uaa-cli-homebrew
- uaa-cli-debian
Expand Down Expand Up @@ -84,10 +83,9 @@ groups:
- kafka-service-broker-homebrew
- gotcha-homebrew
- genesis-homebrew
- bosh2-homebrew
- bosh-homebrew
- uaa-cli-homebrew
- riff-homebrew
- bosh-init-homebrew
- govc-homebrew
- name: debian
jobs:
Expand Down Expand Up @@ -690,7 +688,7 @@ jobs:
REPO_ROOT: homebrew
REPO_OUT: pushme
IN_BINARY: "bosh-cli-*-linux-amd64"
OUT_BINARY: bosh bosh2
OUT_BINARY: bosh bosh
NAME: bosh-cli
LICENSE: Apache2
DESCRIPTION: Interact with BOSH director
Expand All @@ -704,30 +702,30 @@ jobs:
GPG_PUBLIC_KEY: (( grab meta.gpg.public_key ))
GPG_PRIVATE_KEY: (( grab meta.gpg.private_key ))

- name: bosh2-homebrew
- name: bosh-homebrew
public: true
serial: true
plan:
- aggregate:
- get: homebrew
resource: homebrew
- get: bosh2
resource: bosh2
- get: bosh
resource: bosh
trigger: true
- task: update-homebrew
config:
platform: linux
image_resource: (( grab meta.image ))
inputs:
- name: homebrew
- name: bosh2
- name: bosh
path: recipe
outputs:
- name: pushme
run:
path: "homebrew/ci/scripts/update-homebrew.sh"
args:
- bosh2.rb
- bosh.rb
params:
REPO_ROOT: homebrew
REPO_OUT: pushme
Expand All @@ -737,39 +735,6 @@ jobs:
repository: pushme/homebrew
rebase: true

- name: bosh-init-homebrew
public: true
serial: true
plan:
- aggregate:
- get: homebrew
resource: homebrew
- get: bosh-init
resource: bosh-init
trigger: true
- task: update-homebrew
config:
platform: linux
image_resource: (( grab meta.image ))
inputs:
- name: homebrew
- name: bosh-init
path: recipe
outputs:
- name: pushme
run:
path: "homebrew/ci/scripts/update-homebrew.sh"
args:
- bosh-init.rb
params:
REPO_ROOT: homebrew
REPO_OUT: pushme
BINARY: "bosh-init-*-darwin-amd64"
- put: homebrew
params:
repository: pushme/homebrew
rebase: true

- name: credhub-cli-debian
public: true
serial_groups: [apt]
Expand Down Expand Up @@ -1697,7 +1662,7 @@ resources:
repository: install-debs-in-order
access_token: (( grab meta.github.access_token ))

- name: bosh2
- name: bosh
type: github-release
source:
user: cloudfoundry
Expand All @@ -1710,13 +1675,6 @@ resources:
bucket: bosh-cli-artifacts
regexp: bosh-cli-(.*)-linux-amd64

- name: bosh-init
type: github-release
source:
user: cloudfoundry
repository: bosh-init
access_token: (( grab meta.github.access_token ))

- name: credhub-cli
type: github-release
source:
Expand Down

0 comments on commit 5663f07

Please sign in to comment.