Introduce invoice templates (#99)

* introduce invoice templates
* push image from Jenkins on epic branches
* bump machinegun version
This commit is contained in:
Anton Belyaev 2017-07-26 17:50:32 +03:00 committed by GitHub
parent 5238289da7
commit 5df0d2b01a
5 changed files with 41 additions and 38 deletions

37
Jenkinsfile vendored
View File

@ -1,4 +1,5 @@
#!groovy
// -*- mode: groovy -*-
def finalHook = {
runStage('store CT logs') {
@ -19,24 +20,26 @@ build('hellgate', 'docker-host', finalHook) {
}
pipeDefault() {
runStage('compile') {
withGithubPrivkey {
sh 'make wc_compile'
if (env.BRANCH_NAME != 'master') {
runStage('compile') {
withGithubPrivkey {
sh 'make wc_compile'
}
}
}
runStage('lint') {
sh 'make wc_lint'
}
runStage('xref') {
sh 'make wc_xref'
}
runStage('dialyze') {
withWsCache("_build/default/rebar3_19.1_plt") {
sh 'make wc_dialyze'
runStage('lint') {
sh 'make wc_lint'
}
runStage('xref') {
sh 'make wc_xref'
}
runStage('dialyze') {
withWsCache("_build/default/rebar3_19.1_plt") {
sh 'make wc_dialyze'
}
}
runStage('test') {
sh "make wdeps_test"
}
}
runStage('test') {
sh "make wdeps_test"
}
runStage('make release') {
withGithubPrivkey {
@ -48,7 +51,7 @@ build('hellgate', 'docker-host', finalHook) {
}
try {
if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'epic/multiclaims') {
if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME.startsWith('epic')) {
runStage('push image') {
sh "make push_image"
}

View File

@ -24,10 +24,10 @@ services:
condition: service_healthy
machinegun:
image: dr.rbkmoney.com/rbkmoney/machinegun:707c2f8015f21de8dd9aa51a748532fe384c3a60
image: dr.rbkmoney.com/rbkmoney/machinegun:535d1492b20e0151ba245cbbd3152efc70726c91
command: /opt/machinegun/bin/machinegun foreground
volumes:
- ./test/machinegun/sys.config:/opt/machinegun/releases/0.1.0/sys.config
- ./test/machinegun/config.yaml:/opt/machinegun/etc/config.yaml
healthcheck:
test: "curl http://localhost:8022/"
interval: 5s

View File

@ -4,7 +4,7 @@
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"1.0.2">>},2},
{<<"dmsl">>,
{git,"git@github.com:rbkmoney/damsel_erlang.git",
{ref,"28c3fb4844357bf499151f24eddeae38ce22c609"}},
{ref,"859d5eda5482ffec17c2226de0b58dab6d63429f"}},
0},
{<<"dmt_client">>,
{git,"git@github.com:rbkmoney/dmt_client.git",

View File

@ -0,0 +1,18 @@
namespaces:
invoice:
event_sink: payproc
processor:
url: http://hellgate:8022/v1/stateproc/invoice
invoice_template:
event_sink: payproc
processor:
url: http://hellgate:8022/v1/stateproc/invoice_template
party:
event_sink: payproc
processor:
url: http://hellgate:8022/v1/stateproc/party
domain-config:
processor:
url: http://dominant:8022/v1/stateproc
storage:
type: memory

View File

@ -1,18 +0,0 @@
[
{mg_woody_api, [
{storage, mg_storage_memory},
{namespaces, #{
<<"invoice">> => #{
processor => #{url => <<"http://hellgate:8022/v1/stateproc/invoice">>},
event_sink => <<"payproc">>
},
<<"party">> => #{
processor => #{url => <<"http://hellgate:8022/v1/stateproc/party">>},
event_sink => <<"payproc">>
},
<<"domain-config">> => #{
processor => #{url => <<"http://dominant:8022/v1/stateproc">>}
}
}}
]}
].