Properly clone the plugin-site frontend into a subdirectory instead of on top of our existing code

`git` checks out into the "current directory" which means we were technically
builting just the node-only (plugin site frontend) container before
This commit is contained in:
R. Tyler Croy 2016-11-02 09:01:50 -07:00
parent 62b7d5c113
commit 1d34337a18
No known key found for this signature in database
GPG Key ID: 1426C7DC3F51E16F
1 changed files with 6 additions and 8 deletions

14
Jenkinsfile vendored
View File

@ -17,7 +17,7 @@ node('docker') {
sh 'git rev-parse HEAD > GIT_COMMIT' sh 'git rev-parse HEAD > GIT_COMMIT'
shortCommit = readFile('GIT_COMMIT').take(6) shortCommit = readFile('GIT_COMMIT').take(6)
dir('deploy') { dir('deploy/plugin-site') {
echo 'Cloning the latest front-end site for baking our container' echo 'Cloning the latest front-end site for baking our container'
git 'https://github.com/jenkins-infra/plugin-site.git' git 'https://github.com/jenkins-infra/plugin-site.git'
} }
@ -76,13 +76,11 @@ node('docker') {
* Spin up our built container and make sure we can execute API * Spin up our built container and make sure we can execute API
* calls against it before calling it successful * calls against it before calling it successful
*/ */
// XXX: Disabled until I can identify why the inner wget cannot stage('Verify Container') {
// connect to port 8080 container.withRun("--link ${c.id}:nginx -e DATA_FILE_URL=http://nginx/plugins.json.gzip -p 8080:8080") { api ->
//stage('Verify Container') { sh 'wget --debug -O /dev/null --retry-connrefused --timeout 120 http://127.0.0.1:8080/versions'
// container.withRun("--link ${c.id}:nginx -e DATA_FILE_URL=http://nginx/plugins.json.gzip -p 8080:8080") { api -> }
// sh 'wget --debug -O /dev/null --retry-connrefused --timeout 120 http://127.0.0.1:8080/versions' }
// }
//}
stage('Tag container as latest') { stage('Tag container as latest') {
if (!(isPullRequest || isMultibranch)) { if (!(isPullRequest || isMultibranch)) {