fixed issues in build process

chizou · rfecher · commit 3e8981cf131e · 2017-03-29T10:05:28.000-04:00
diff --git a/deploy/Jenkinsfile b/deploy/Jenkinsfile
@@ -0,0 +1,24 @@
+node {
+   stage 'Wipe workspace'
+   deleteDir()
+
+   // Mark the code checkout 'stage'
+   stage 'Checkout'
+   // Get GeoWave source from GitHub repository
+checkout([$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', noTags: false, reference: '', shallow: true], [$class: 'LocalBranch', localBranch: 'master']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/ngageoint/geowave.git']]])
+   // Mark the create docker image 'stage'
+   stage 'Create Docker Image'
+   // Build the docker container
+   sh 'docker build -t ngageoint/geowave-centos6-java8-build -f deploy/packaging/docker/geowave-centos6-java8-build.dockerfile deploy/packaging/docker'
+   sh 'docker build -t ngageoint/geowave-centos6-rpm-build -f deploy/packaging/docker/geowave-centos6-rpm-build.dockerfile deploy/packaging/docker'
+   sh 'docker build -t ngageoint/geowave-centos6-publish -f deploy/packaging/docker/geowave-centos6-publish.dockerfile deploy/packaging/docker'
+
+   // Mark the build artifacts 'stage'....
+   stage 'Build and Publish RPMs'
+   sh 'deploy/packaging/docker/docker-build-rpms.sh'
+
+   // Deploy to geowave-rpms
+   stage 'Deploying to s3://geowave-rpms/'
+   sh 'aws s3 sync /var/www/html/repos/snapshots/geowave/dev/ s3://geowave-rpms/dev/'
+   sh 'aws s3 sync /var/www/html/repos/snapshots/geowave/release/ s3://geowave-rpms/release/'
+}
diff --git a/deploy/packaging/docker/publish/publish-common-rpm.sh b/deploy/packaging/docker/publish/publish-common-rpm.sh
@@ -72,6 +72,7 @@ rm -rf geowave
 
 echo '###### Copy rpm to repo and reindex'
 
+mkdir -p ${LOCAL_REPO_DIR}/${ARGS[repo]}/${BUILD_TYPE}/{SRPMS,TARBALL,${ARGS[arch]}}/
 cp -R ${WORKSPACE}/${ARGS[buildroot]}/RPMS/${ARGS[arch]}/*.rpm ${LOCAL_REPO_DIR}/${ARGS[repo]}/${BUILD_TYPE}/${ARGS[arch]}/
 cp -fR ${WORKSPACE}/${ARGS[buildroot]}/SRPMS/*.rpm ${LOCAL_REPO_DIR}/${ARGS[repo]}/${BUILD_TYPE}/SRPMS/
 cp -fR ${WORKSPACE}/${ARGS[buildroot]}/TARBALL/*.tar.gz ${LOCAL_REPO_DIR}/${ARGS[repo]}/${BUILD_TYPE}/TARBALL/
@@ -83,4 +84,4 @@ cp -fR ${WORKSPACE}/${ARGS[buildroot]}/TARBALL/*.tar.gz ${LOCAL_REPO_DIR}/${ARGS
 # up and fail. the ha* commands are from the hatools rpm available via EPEL.
 hatimerun -t 10:00 \
 halockrun -c ${LOCK_DIR}/rpmrepo \
-createrepo --update --workers 2 ${LOCAL_REPO_DIR}/${ARGS[repo]}/${BUILD_TYPE}/${ARGS[arch]}/
+createrepo --update --workers 2 ${LOCAL_REPO_DIR}/${ARGS[repo]}/${BUILD_TYPE}/${ARGS[arch]}/
diff --git a/deploy/packaging/docker/publish/publish-vendor-rpm.sh b/deploy/packaging/docker/publish/publish-vendor-rpm.sh
@@ -65,6 +65,8 @@ cp ${WORKSPACE}/${ARGS[buildroot]}/SOURCES/geowave-c++-${GEOWAVE_VERSION}-${VEND
 
 echo '###### Copy rpm to repo and reindex'
 
+mkdir -p ${LOCAL_REPO_DIR}/${ARGS[repo]}/${BUILD_TYPE}/{SRPMS,TARBALL,${ARGS[arch]}}/
+mkdir -p ${LOCAL_REPO_DIR}/${ARGS[repo]}/${BUILD_TYPE}-jars/JAR/
 cp -R ${WORKSPACE}/${ARGS[buildroot]}/RPMS/${ARGS[arch]}/*.rpm ${LOCAL_REPO_DIR}/${ARGS[repo]}/${BUILD_TYPE}/${ARGS[arch]}/
 cp -fR ${WORKSPACE}/${ARGS[buildroot]}/SRPMS/*.rpm ${LOCAL_REPO_DIR}/${ARGS[repo]}/${BUILD_TYPE}/SRPMS/
 cp -fR ${WORKSPACE}/${ARGS[buildroot]}/TARBALL/*.tar.gz ${LOCAL_REPO_DIR}/${ARGS[repo]}/${BUILD_TYPE}/TARBALL/
@@ -79,4 +81,4 @@ popd
 # up and fail. the ha* commands are from the hatools rpm available via EPEL.
 hatimerun -t 10:00 \
 halockrun -c ${LOCK_DIR}/rpmrepo \
-createrepo --update --workers 2 ${LOCAL_REPO_DIR}/${ARGS[repo]}/${BUILD_TYPE}/${ARGS[arch]}/
+createrepo --update --workers 2 ${LOCAL_REPO_DIR}/${ARGS[repo]}/${BUILD_TYPE}/${ARGS[arch]}/
