Skip to content

Commit 83d420f

Browse files
committed
Merge branch 'hotfix/tile-fix'
2 parents 6f6e955 + 80765d6 commit 83d420f

7 files changed

Lines changed: 32 additions & 33 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
product/
22
release/
33
event.db
4-
firehose-to-sumologic.zip
54
tile-history.yml
65
sumo-logic-nozzle.zip
76

Procfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web: firehose-to-sumologic
1+
web: cloudfoundry-sumologic-nozzle

ci/build-all/build-all

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ cd $GOPATH/src/github.com/mcplusa/cloudfoundry-sumologic-nozzle
99
make clean
1010
make compile
1111

12-
mv dist ${ROOT_DIR}/firehose-to-sumologic-ci-build/
12+
mv dist ${ROOT_DIR}/cloudfoundry-sumologic-nozzle-ci-build/

ci/build-all/build-all.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ image_resource:
88

99

1010
inputs:
11-
- name: firehose-to-sumologic-ci
11+
- name: cloudfoundry-sumologic-nozzle-ci
1212
path: gopath/src/github.com/mcplusa/cloudfoundry-sumologic-nozzle/
1313
- name: version
1414

1515
outputs:
16-
- name: firehose-to-sumologic-ci-build
16+
- name: cloudfoundry-sumologic-nozzle-ci-build
1717

1818
run:
1919
path: gopath/src/github.com/mcplusa/cloudfoundry-sumologic-nozzle/ci/build-all/build-all

ci/pipeline.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
groups:
3-
- name: firehose-to-sumologic
3+
- name: cloudfoundry-sumologic-nozzle
44
jobs:
55
- unit-testing
66
- downstream-master
@@ -24,59 +24,59 @@ jobs:
2424
public: true
2525
serial: true
2626
plan:
27-
- get: firehose-to-sumologic-ci
28-
resource: firehose-to-sumologic-develop
27+
- get: cloudfoundry-sumologic-nozzle-ci
28+
resource: cloudfoundry-sumologic-nozzle-develop
2929
trigger: true
3030
- task: unit-testing
31-
file: firehose-to-sumologic-ci/ci/unit-testing/unit-testing.yml
31+
file: cloudfoundry-sumologic-nozzle-ci/ci/unit-testing/unit-testing.yml
3232

3333

3434
- name: unit-testing-master
3535
public: true
3636
serial: true
3737
plan:
38-
- get: firehose-to-sumologic-ci
39-
resource: firehose-to-sumologic-master
38+
- get: cloudfoundry-sumologic-nozzle-ci
39+
resource: cloudfoundry-sumologic-nozzle-master
4040
trigger: true
4141
- task: unit-testing
42-
file: firehose-to-sumologic-ci/ci/unit-testing/unit-testing.yml
42+
file: cloudfoundry-sumologic-nozzle-ci/ci/unit-testing/unit-testing.yml
4343

4444

4545
- name: tag-master
4646
public: true
4747
serial: true
4848
plan:
49-
- get: firehose-to-sumologic-ci
50-
resource: firehose-to-sumologic-master
49+
- get: cloudfoundry-sumologic-nozzle-ci
50+
resource: cloudfoundry-sumologic-nozzle-master
5151
passed: [unit-testing-master]
5252
- put: version
5353
params: {bump: minor}
54-
- put: firehose-to-sumologic-master
54+
- put: cloudfoundry-sumologic-nozzle-master
5555
params:
5656
only_tag: true
57-
repository: firehose-to-sumologic-ci
57+
repository: cloudfoundry-sumologic-nozzle-ci
5858
tag: version/number
5959

6060

6161
- name: ship-it
6262
public: true
6363
serial: true
6464
plan:
65-
- get: firehose-to-sumologic-ci
66-
resource: firehose-to-sumologic-master
65+
- get: cloudfoundry-sumologic-nozzle-ci
66+
resource: cloudfoundry-sumologic-nozzle-master
6767
passed: [tag-master]
6868
trigger: true
6969
- get: version
7070
- task: build-binary
71-
file: firehose-to-sumologic-ci/ci/build-all/build-all.yml
71+
file: cloudfoundry-sumologic-nozzle-ci/ci/build-all/build-all.yml
7272
params:
7373
VERSION_APP: version/number
7474
- put: gh-release
7575
params :
7676
name: version/number
7777
tag: version/number
7878
globs:
79-
- firehose-to-sumologic-ci-build/dist/*/*/*
79+
- cloudfoundry-sumologic-nozzle-ci-build/dist/*/*/*
8080

8181

8282

@@ -86,16 +86,16 @@ jobs:
8686
serial: true
8787
plan:
8888
- aggregate:
89-
- get: firehose-to-sumologic-ci
90-
resource: firehose-to-sumologic-develop
89+
- get: cloudfoundry-sumologic-nozzle-ci
90+
resource: cloudfoundry-sumologic-nozzle-develop
9191
- get: release-repo-master
9292
resource: firehouse-to-sumologic-master
9393
trigger: true
9494
passed: [tag-master]
9595
- get: release-repo
96-
resource: firehose-to-sumologic-merge-target
96+
resource: cloudfoundry-sumologic-nozzle-merge-target
9797
- task: merge-master-to-develop
98-
file: firehose-to-sumologic-ci/ci/merge-master-to-develop/merge-master-to-develop.yml
98+
file: cloudfoundry-sumologic-nozzle-ci/ci/merge-master-to-develop/merge-master-to-develop.yml
9999
params:
100100
GIT_USERNAME: {{github-username}}
101101
GIT_EMAIL: {{github-email}}
@@ -104,17 +104,17 @@ jobs:
104104

105105

106106
resources:
107-
- name: firehose-to-sumologic-merge-target
107+
- name: cloudfoundry-sumologic-nozzle-merge-target
108108
type: git
109109
source:
110110
branch: develop
111111
private_key: {{private-key-github-concourse}}
112-
uri: git@github.com:cloudfoundry-community/firehose-to-sumologic.git
112+
uri: git@github.com:cloudfoundry-community/cloudfoundry-sumologic-nozzle.git
113113

114-
- name: firehose-to-sumologic-develop
114+
- name: cloudfoundry-sumologic-nozzle-develop
115115
type: git
116116
source:
117-
uri: git@github.com:cloudfoundry-community/firehose-to-sumologic.git
117+
uri: git@github.com:cloudfoundry-community/cloudfoundry-sumologic-nozzle.git
118118
branch: develop
119119
private_key: {{private-key-github-concourse}}
120120

@@ -131,14 +131,14 @@ resources:
131131
type: github-release
132132
source:
133133
user: cloudfoundry-community
134-
repository: firehose-to-sumologic
134+
repository: cloudfoundry-sumologic-nozzle
135135
access_token: {{github-access-token}}
136136

137137
- name: version
138138
type: semver-gwenn
139139
source:
140140
driver: git
141-
uri: git@github.com:cloudfoundry-community/firehose-to-sumologic.git
141+
uri: git@github.com:cloudfoundry-community/cloudfoundry-sumologic-nozzle.git
142142
branch: version
143143
file: version
144144
private_key: {{private-key-github-concourse}}

manifest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
applications:
2-
- name: firehose-to-sumologic
2+
- name: cloudfoundry-sumologic-nozzle
33
env:
4-
FIREHOSE_SUBSCRIPTION_ID: firehose-to-sumologic
4+
FIREHOSE_SUBSCRIPTION_ID: cloudfoundry-sumologic-nozzle
55
LOG_EVENTS_BATCHSIZE: 200
66
SUMO_POST_MINIMUM_DELAY: 200ms
77
F2S_DISABLE_LOGGING: true

tile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ packages:
3131
manifest:
3232
# any options that you would normally specify in a cf manifest.yml, including</i>
3333
buildpack: https://github.com/cloudfoundry/go-buildpack.git
34-
command: firehose-to-sumologic
34+
command: cloudfoundry-sumologic-nozzle
3535
path: sumo-logic-nozzle.zip
3636
health_check: none
3737
needs_cf_credentials: true

0 commit comments

Comments
 (0)