summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-10-29 23:31:40 -0700
committerGitHub <noreply@github.com>2017-10-29 23:31:40 -0700
commitbbe971cc4522dfa567d7dceafcf30a7afd5c35be (patch)
tree7dfc794b94a465345364688b28b78ff07a4d23b8 /build
parent4e9eb395a18a00cf735a702d68eb5f76fb3d2416 (diff)
downloadchat-bbe971cc4522dfa567d7dceafcf30a7afd5c35be.tar.gz
chat-bbe971cc4522dfa567d7dceafcf30a7afd5c35be.tar.bz2
chat-bbe971cc4522dfa567d7dceafcf30a7afd5c35be.zip
Fixing credentials and typo in Jenkinsfile (#7732)
Diffstat (limited to 'build')
-rw-r--r--build/Jenkinsfile8
1 files changed, 4 insertions, 4 deletions
diff --git a/build/Jenkinsfile b/build/Jenkinsfile
index 2d6b99748..ebef7ca3d 100644
--- a/build/Jenkinsfile
+++ b/build/Jenkinsfile
@@ -110,17 +110,17 @@ podTemplate(label: 'jenkins-slave',
container('golang') {
// Checkout mattermost-server
dir('mattermost-server') {
- git branch: env.BRANCH_NAME, credentialsId: 'a8f2d76b-8a29-4525-b57a-eb0447d7779c', url: 'https://github.com/mattermost/mattermost-server.git'
+ git branch: env.BRANCH_NAME, credentialsId: 'mattermostBuild', url: 'https://github.com/mattermost/mattermost-server.git'
}
dir('mattermost-webapp') {
- git branch: 'master', credentialsId: 'a8f2d76b-8a29-4525-b57a-eb0447d7779c', url: 'https://github.com/mattermost/mattermost-webapp.git'
+ git branch: 'master', credentialsId: 'mattermostBuild', url: 'https://github.com/mattermost/mattermost-webapp.git'
sh "git checkout ${env.BRANCH_NAME} || echo 'NO CLIENT BRANCH'"
}
// Checkout enterprise
dir('enterprise') {
- git branch: 'master', credentialsId: 'a8f2d76b-8a29-4525-b57a-eb0447d7779c', url: 'https://github.com/mattermost/enterprise.git'
+ git branch: 'master', credentialsId: 'mattermostBuild', url: 'https://github.com/mattermost/enterprise.git'
sh "git checkout ${env.BRANCH_NAME} || echo 'NO EE BRANCH'"
}
}
@@ -182,7 +182,7 @@ podTemplate(label: 'jenkins-slave',
}
}
stage('S3 Publish') {
- step([$class: 'S3BucketPublisher', dontWaitForConcurrentBuildCompletion: false, entries: [[bucket: 'releases.mattermost.com/mattermost-server/${env.BRAANCH_NAME}', excludedFile: '', flatten: true, gzipFiles: false, keepForever: false, managedArtifacts: false, noUploadOnFailure: true, selectedRegion: 'us-east-1', showDirectlyInBrowser: false, sourceFile: 'src/github.com/mattermost/platform/dist/mattermost-enterprise*', storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false, userMetadata: [[key: 'Cache-Control', value: 'no-cache']]]], profileName: 'Releases', userMetadata: []])
+ step([$class: 'S3BucketPublisher', dontWaitForConcurrentBuildCompletion: false, entries: [[bucket: 'releases.mattermost.com/mattermost-server/${env.BRANCH_NAME}', excludedFile: '', flatten: true, gzipFiles: false, keepForever: false, managedArtifacts: false, noUploadOnFailure: true, selectedRegion: 'us-east-1', showDirectlyInBrowser: false, sourceFile: 'src/github.com/mattermost/platform/dist/mattermost-enterprise*', storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false, userMetadata: [[key: 'Cache-Control', value: 'no-cache']]]], profileName: 'Releases', userMetadata: []])
}
}
}