Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automate build system #1428

Closed
wants to merge 22 commits into from
Closed

Automate build system #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
db43ba0
Implement automatic build dependencies for docker images
smlx Nov 3, 2019
d4c1c97
Update the build-dep in logs2logs-db
smlx Nov 3, 2019
98c2b64
Consolidate elastic stack Dockerfiles
smlx Nov 3, 2019
805f052
Use BASE_VERSION for node, python and solr
smlx Nov 3, 2019
9a87e96
Update php Dockerfiles
smlx Nov 5, 2019
7467061
Use ALPINE_VERSION in local-dev images
smlx Apr 8, 2020
7127f7c
Update build dependencies
smlx Apr 8, 2020
46d299e
Remove unused code
smlx Apr 8, 2020
f0c8300
Update rebuild/push build targets
smlx Dec 16, 2019
8d4124d
Avoid phony prerequisites to file targets
smlx Apr 16, 2020
45d89d9
Update Jenkinsfile to use automated build system
smlx Dec 17, 2019
522082f
Add help function and comments to Makefile
smlx Apr 8, 2020
eb09c2a
Add optional ALPINE_VERSION arg to docker_build_version_cmd func
smlx Apr 8, 2020
d1ba557
Remove make clean from Jenkinsfile
smlx Apr 9, 2020
621cd05
Remove unused local-minio dependency
smlx Apr 16, 2020
8c554d5
Fix tests-{openshift,kubernetes} build
smlx Apr 16, 2020
ce7e626
push-minishift -> push-local-registry
smlx Apr 16, 2020
56c0aa5
Fix the push-local-registry dependency
smlx Apr 16, 2020
8a22f1b
Re-add generated push-minishift rules
smlx Apr 17, 2020
2aec6a8
Update push-minishift dependencies
smlx Apr 17, 2020
dc01593
Fix up Jenkinsfile
smlx Apr 17, 2020
5194e88
Add missing minishift docker login dependency
smlx Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ k3d
kubectl
**/v8-*
node_modules/
build/*
!build/.gitkeep
openshift
!services/api/src/resources/openshift
.loopback
Expand All @@ -24,3 +22,5 @@ docs/_build
yarn-debug.log*
yarn-error.log*
site
/.docker.mk
/pull-report.json
16 changes: 10 additions & 6 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,13 @@ node {
env.GIT_COMMIT = checkout["GIT_COMMIT"]
}

stage ('pull base images') {
sh "make build:pull"
sh "cat pull-report.json"
}

stage ('build images') {
sh "make -O${SYNC_MAKE_OUTPUT} -j6 build"
sh "make -O${SYNC_MAKE_OUTPUT} -j6 build:all"
}

try {
Expand All @@ -63,7 +68,7 @@ node {
try {
sh 'make minishift/cleanall || echo'
sh "make minishift MINISHIFT_CPUS=16 MINISHIFT_MEMORY=32GB MINISHIFT_DISK_SIZE=50GB MINISHIFT_VERSION=${minishift_version} OPENSHIFT_VERSION=${openshift_version}"
sh "make -O${SYNC_MAKE_OUTPUT} push-minishift -j5"
sh "make -O${SYNC_MAKE_OUTPUT} build:push-minishift -j5"
sh "make -O${SYNC_MAKE_OUTPUT} openshift-tests -j7"
} catch (e) {
echo "Something went wrong, trying to cleanup"
Expand Down Expand Up @@ -95,7 +100,7 @@ node {
try {
if (env.SKIP_IMAGE_PUBLISH != 'true') {
sh 'docker login -u amazeeiojenkins -p $PASSWORD'
sh "make -O${SYNC_MAKE_OUTPUT} -j4 publish-amazeeiolagoon-baseimages publish-amazeeiolagoon-serviceimages BRANCH_NAME=${SAFEBRANCH_NAME}"
sh "make -O${SYNC_MAKE_OUTPUT} -j4 publish:amazeeiolagoon-baseimages publish:amazeeiolagoon-serviceimages BRANCH_NAME=${SAFEBRANCH_NAME}"
} else {
sh 'echo "skipped because of SKIP_IMAGE_PUBLISH env variable"'
}
Expand All @@ -118,14 +123,14 @@ node {
stage ('publish-amazeeio') {
withCredentials([string(credentialsId: 'amazeeiojenkins-dockerhub-password', variable: 'PASSWORD')]) {
sh 'docker login -u amazeeiojenkins -p $PASSWORD'
sh "make -O${SYNC_MAKE_OUTPUT} -j4 publish-amazeeio-baseimages"
sh "make -O${SYNC_MAKE_OUTPUT} -j4 publish:amazeeio-baseimages"
}
}
}

if (env.BRANCH_NAME == 'master' && env.SKIP_IMAGE_PUBLISH != 'true') {
stage ('save-images-s3') {
sh "make -O${SYNC_MAKE_OUTPUT} -j8 s3-save"
sh "make -O${SYNC_MAKE_OUTPUT} -j8 build:s3-save"
}
}

Expand All @@ -147,7 +152,6 @@ def cleanup() {
sh "make down || true"
sh "make kill"
sh "make down"
sh "make clean"
} catch (error) {
echo "cleanup failed, ignoring this."
}
Expand Down
Loading