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

By default clean up builds; previously some jobs didn't. #2256

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

By default clean up builds; previously some jobs didn't. #2256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d75de8
By default clean up; previously some jobs didn't.
itamarst Nov 30, 2015
c5a9ba4
Maybe cleaning up is fine?
itamarst Dec 1, 2015
2778dd1
Add output indicating deletion happened.
itamarst Dec 1, 2015
00e1e8b
Better printing method.
itamarst Dec 1, 2015
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
17 changes: 1 addition & 16 deletions build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ common_cli:
# Toggles:
# * archive_artifacts: ( define if there are files to be archived)
# * coverage_report: ( enable if this job produces a coverage report file)
# * clean_repo: (enable if we need to clean old files owned by root)
# * dont_clean_repo: (enable if we don't want to delete old files owned by root)
#

# run_trial_modules contains a list of all the modules we want to execute
Expand Down Expand Up @@ -852,7 +852,6 @@ job_type:
archive_artifacts: *flocker_artifacts
publish_test_results: true
coverage_report: true
clean_repo: true
timeout: 30

run_trial_on_AWS_CentOS_7_as_root:
Expand All @@ -864,7 +863,6 @@ job_type:
archive_artifacts: *flocker_artifacts
publish_test_results: true
coverage_report: true
clean_repo: true
timeout: 30

# http://build.clusterhq.com/builders/flocker-admin
Expand All @@ -877,7 +875,6 @@ job_type:
archive_artifacts: *flocker_artifacts
publish_test_results: true
coverage_report: true
clean_repo: true
timeout: 30

run_trial_on_AWS_Ubuntu_Trusty_as_root:
Expand All @@ -889,7 +886,6 @@ job_type:
archive_artifacts: *flocker_artifacts
publish_test_results: true
coverage_report: true
clean_repo: true
timeout: 30


Expand All @@ -909,7 +905,6 @@ job_type:
}
archive_artifacts: *flocker_artifacts
coverage_report: true
clean_repo: true
timeout: 45

run_trial_for_ebs_storage_driver_on_Ubuntu_trusty:
Expand All @@ -928,7 +923,6 @@ job_type:
archive_artifacts: *flocker_artifacts
publish_test_results: true
coverage_report: true
clean_repo: true
timeout: 45


Expand All @@ -948,7 +942,6 @@ job_type:
archive_artifacts: *flocker_artifacts
publish_test_results: true
coverage_report: true
clean_repo: true
timeout: 45

run_trial_for_cinder_storage_driver_on_Ubuntu_trusty:
Expand All @@ -967,7 +960,6 @@ job_type:
archive_artifacts: *flocker_artifacts
publish_test_results: true
coverage_report: true
clean_repo: true
timeout: 45


Expand Down Expand Up @@ -1005,7 +997,6 @@ job_type:
*clean_packages,
*exit_with_return_code_from_test ]
}
clean_repo: true
archive_artifacts: *acceptance_tests_artifacts
timeout: 45
run_acceptance_on_AWS_Ubuntu_Trusty_for:
Expand All @@ -1025,7 +1016,6 @@ job_type:
*clean_packages,
*exit_with_return_code_from_test ]
}
clean_repo: true
archive_artifacts: *acceptance_tests_artifacts_ubuntu_special_case
timeout: 45
run_acceptance_on_Rackspace_CentOS_7_for:
Expand All @@ -1047,7 +1037,6 @@ job_type:
*clean_packages,
*exit_with_return_code_from_test ]
}
clean_repo: true
archive_artifacts: *acceptance_tests_artifacts
timeout: 45
run_acceptance_on_Rackspace_Ubuntu_Trusty_for:
Expand All @@ -1069,7 +1058,6 @@ job_type:
*clean_packages,
*exit_with_return_code_from_test ]
}
clean_repo: true
archive_artifacts: *acceptance_tests_artifacts_ubuntu_special_case
timeout: 45

Expand All @@ -1089,7 +1077,6 @@ job_type:
*clean_packages,
*exit_with_return_code_from_test ]
}
clean_repo: true
timeout: 30
run_client_installation_on_Ubuntu_Vivid:
on_nodes_with_labels: 'aws-ubuntu-trusty-T2Medium'
Expand All @@ -1105,7 +1092,6 @@ job_type:
*clean_packages,
*exit_with_return_code_from_test ]
}
clean_repo: true
timeout: 30
run_client_installation_on_OSX:
on_nodes_with_labels: 'mesos-1GB'
Expand Down Expand Up @@ -1138,7 +1124,6 @@ job_type:
*run_build_sh_script_on_vagrant_box,
*destroy_vagrant_box]
}
clean_repo: false
timeout: 30


Expand Down
11 changes: 7 additions & 4 deletions jobs.groovy.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,15 @@ listView("${dashProject}/${dashBranchName}/{{name}}") {
the priviledges to remove the root owned files created by the sudo tests.
To fix this issue, we use a preSCM plugin which allows us to execute a
step before cloning/checking the git reposity.
if the build.yaml contains a 'clean_repo' flag, then we will clean up
old root files from the repo. #}
{% if v.clean_repo %}
if the build.yaml contains a 'dont_clean_repo' flag, then we won't clean
up old root files from the repo #}
{% if v.dont_clean_repo is not defined or not v.dont_clean_repo %}
preScmSteps {
steps {
shell("sudo rm -rf {{ directory_to_delete }}")
shell("""
sudo rm -rf {{ directory_to_delete }}
echo 'Deleted directory {{ directory_to_delete }}'
""")
}
}
{% endif %}
Expand Down