Merge "ssl support janitor"
diff --git a/docker/swarm/stack/pushkin.yml b/docker/swarm/stack/pushkin.yml
index 593f532..71b5f5f 100644
--- a/docker/swarm/stack/pushkin.yml
+++ b/docker/swarm/stack/pushkin.yml
@@ -7,6 +7,8 @@
pushkin_ssl:
enabled: false
pushkin_db: pushkin
+ pushkin_smtp_host: smtp.gmail.com
+ pushkin_smtp_port: 587
docker:
client:
stack:
@@ -18,6 +20,9 @@
PUSHKINDBHOST: ${_param:postgresql_bind_host}
PUSHKINELASTICHOST: ${_param:elasticsearch_bind_host}
WEBHOOK_FROM: ${_param:webhook_from}
+ EMAIL_SENDER_PASSWORD: ${_param:pushkin_email_sender_password}
+ SMTP_HOST: ${_param:pushkin_smtp_host}
+ SMTP_PORT: ${_param:pushkin_smtp_port}
WEBHOOK_RECIPIENTS: ${_param:webhook_recipients}
WEBHOOK_LOGIN_ID: ${_param:webhook_login_id}
WEBHOOK_APPLICATION_ID: ${_param:webhook_application_id}
diff --git a/jenkins/client/job/oss/init.yml b/jenkins/client/job/oss/init.yml
index 0e23f01..f8b5bdc 100644
--- a/jenkins/client/job/oss/init.yml
+++ b/jenkins/client/job/oss/init.yml
@@ -1,3 +1,4 @@
classes:
- system.jenkins.client.job.oss.test_devops_portal
+ - system.jenkins.client.job.oss.test_devops_portal_nightly
- system.jenkins.client.job.oss.test_security_monkey_openstack
diff --git a/jenkins/client/job/oss/test_devops_portal.yml b/jenkins/client/job/oss/test_devops_portal.yml
index 4007010..7001200 100644
--- a/jenkins/client/job/oss/test_devops_portal.yml
+++ b/jenkins/client/job/oss/test_devops_portal.yml
@@ -41,3 +41,6 @@
DEFAULT_GIT_REF:
type: string
default: master
+ NIGHTLY_BUILD:
+ type: boolean
+ default: false
diff --git a/jenkins/client/job/oss/test_devops_portal_nightly.yml b/jenkins/client/job/oss/test_devops_portal_nightly.yml
new file mode 100644
index 0000000..34a8bec
--- /dev/null
+++ b/jenkins/client/job/oss/test_devops_portal_nightly.yml
@@ -0,0 +1,34 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ test-oss-devops-portal-nightly:
+ name: test-oss-devops-portal-nightly
+ discard:
+ build:
+ keep_num: 15
+ artifact:
+ keep_num: 15
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
+ credentials: "gerrit"
+ script: test-devops-portal-pipeline.groovy
+ trigger:
+ timer:
+ spec: "0 23 * * *"
+ param:
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ DEFAULT_GIT_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/oss/devops-portal"
+ DEFAULT_GIT_REF:
+ type: string
+ default: master
+ NIGHTLY_BUILD:
+ type: boolean
+ default: true
diff --git a/postgresql/client/alertmanager.yml b/postgresql/client/alertmanager.yml
new file mode 100644
index 0000000..8bd272a
--- /dev/null
+++ b/postgresql/client/alertmanager.yml
@@ -0,0 +1,30 @@
+classes:
+ - system.postgresql.client
+parameters:
+ _param:
+ alertmanager_db_host: ${_param:haproxy_postgresql_bind_host}
+ alertmanager_db_user: alertmanager
+ alertmanager_db_user_password: alertmanager
+ webhook_login_id: 13
+ webhook_application_id: 24
+ postgresql:
+ client:
+ server:
+ server01:
+ database:
+ alertmanager:
+ enabled: true
+ encoding: 'UTF8'
+ locale: 'en_US'
+ users:
+ - name: ${_param:alertmanager_db_user}
+ password: ${_param:alertmanager_db_user_password}
+ host: ${_param:alertmanager_db_host}
+ createdb: true
+ rights: all privileges
+ init:
+ maintenance_db: pushkin
+ force: true
+ queries:
+ - INSERT INTO login VALUES (${_param:webhook_login_id}, ${_param:webhook_application_id}) ON CONFLICT (id) DO UPDATE SET id = excluded.id;
+ - INSERT INTO device VALUES (${_param:webhook_application_id}, ${_param:webhook_login_id}, 42, 'stacklight_alertmanager', NULL, 1, NULL) ON CONFLICT (id) DO UPDATE SET id = excluded.id;