Skip to content

Commit

Permalink
Merge branch 'release/05.02.06.00'
Browse files Browse the repository at this point in the history
  • Loading branch information
Mason J. Katz authored and Mason J. Katz committed Feb 26, 2019
2 parents 7419f32 + c8f4a80 commit 86b3ecc
Show file tree
Hide file tree
Showing 738 changed files with 1,724 additions and 808 deletions.
33 changes: 7 additions & 26 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pipeline {

triggers {
// Nightly build of develop (at 3am)
cron(env.BRANCH_NAME == 'develop' ? 'H 3 * * *' : '')
cron(env.BRANCH_NAME == 'develop' ? '0 11 * * *' : '')
}

stages {
Expand Down Expand Up @@ -132,25 +132,6 @@ pipeline {
}
}
}

stage('Auto PR') {
// Create the automatic pull request, if needed
steps {
sh '''
# Get the number of pull requests on this branch
set +e
PULL_REQUESTS=$(curl -s "https://api.github.com/repos/Teradata/stacki/pulls?access_token=$GITHUB_TOKEN" | grep -c "\\"ref\\": \\"$GIT_BRANCH\\"")
set -e
# Are there already any pull requests?
if [[ $PULL_REQUESTS == "0" ]]
then
# Create the pull request
curl -H "Content-Type: application/json" -d "{\\"title\\":\\"Auto PR: $GIT_BRANCH\\",\\"head\\":\\"$GIT_BRANCH\\",\\"base\\":\\"develop\\"}" "https://api.github.com/repos/Teradata/stacki/pulls?access_token=$GITHUB_TOKEN"
fi
'''
}
}
}
}

Expand Down Expand Up @@ -748,15 +729,15 @@ pipeline {
s3Upload(
file: env.ISO_FILENAME,
bucket: 'teradata-stacki',
path: '/release/stacki/5.x/',
path: 'release/stacki/5.x/',
acl: 'PublicRead'
)

// And the StackiOS ISO
s3Upload(
file: env.STACKIOS_FILENAME,
bucket: 'teradata-stacki',
path: '/release/stacki/5.x/',
path: 'release/stacki/5.x/',
acl: 'PublicRead'
)
}
Expand Down Expand Up @@ -875,7 +856,7 @@ pipeline {
s3Upload(
file: env.QCOW_FILENAME,
bucket: 'teradata-stacki',
path: '/release/stacki/5.x/',
path: 'release/stacki/5.x/',
acl: 'PublicRead'
)
}
Expand Down Expand Up @@ -906,8 +887,8 @@ pipeline {
color: 'good',
message: """\
New Stacki QCow2 uploaded to Amazon S3.
*URL* http://teradata-stacki.s3.amazonaws.com/release/stacki/5.x/${env.QCOW_FILENAME}
*StackiOS:* http://teradata-stacki.s3.amazonaws.com/release/stacki/5.x/${env.STACKIOS_FILENAME}
*QCow2:* ${env.QCOW_FILENAME}
*URL:* http://teradata-stacki.s3.amazonaws.com/release/stacki/5.x/${env.QCOW_FILENAME}
""".stripIndent(),
tokenCredentialId: 'slack_jenkins_integration_token'
)
Expand Down Expand Up @@ -954,7 +935,7 @@ pipeline {
}

post {
// Clean up afte ourselves
// Clean up after ourselves
always {
cleanWs()
}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# @copyright@
# Copyright (c) 2006 - 2018 Teradata
# Copyright (c) 2006 - 2019 Teradata
# All rights reserved. Stacki(r) v5.x stacki.com
# https://github.com/Teradata/stacki/blob/master/LICENSE.txt
# @copyright@
Expand Down
2 changes: 1 addition & 1 deletion common/graph/backend.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</description>

<copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/graph/base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</description>

<copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/graph/frontend.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</description>

<copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/graph/replicant.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</description>

<copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/ansible-backend.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2017 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/ansible-base.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2017 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/ansible-server.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2017 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/aws-client.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2017 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/aws-server.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2017 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/aws-ssh-key.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2017 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/barnacle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</stack:description>

<stack:copyright>
Copyright (c) 2006 - 2017 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/builder.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</stack:description>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
6 changes: 5 additions & 1 deletion common/nodes/database-data-init.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down Expand Up @@ -150,6 +150,9 @@ with open('/tmp/site.json', 'w') as file:
],
"software": {
"box": [
{
"name": "frontend",
},
{
"name": "default"
}
Expand All @@ -158,6 +161,7 @@ with open('/tmp/site.json', 'w') as file:
"appliance": [
{
"name": "frontend",
"box": "frontend",
"public": false,
"attr": [
{ "name": "node", "value": "server" },
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/database-data.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/database-migration.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/database-schema.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/database.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/dns-server.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
3 changes: 3 additions & 0 deletions common/nodes/docker-server.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>

<stack:package>stack-docker</stack:package>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/foundation-python.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/hash-client.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/ldconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Fix LDConfig for all hosts
</stack:description>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/mq-base.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/mq-client.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/mq-server.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/node-certs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ If additional keys are listed in the authorized_keys attribute, copy those as we
</stack:description>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/node.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ and get DHCP/NIS state from the frontend.
</stack:description>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/peerdone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</stack:description>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/replicant.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</stack:description>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/routes-server.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/ssh-base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</stack:description>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
2 changes: 1 addition & 1 deletion common/nodes/ssl-base.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<stack:stack>

<stack:copyright>
Copyright (c) 2006 - 2018 Teradata
Copyright (c) 2006 - 2019 Teradata
All rights reserved. Stacki(r) v5.x stacki.com
https://github.com/Teradata/stacki/blob/master/LICENSE.txt
</stack:copyright>
Expand Down
Loading

0 comments on commit 86b3ecc

Please sign in to comment.