summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2017-07-25 21:19:54 +0200
committerGitHub <noreply@github.com>2017-07-25 21:19:54 +0200
commitea1d22b3f6151d7316ef73c4b4f08a4c8b591c72 (patch)
tree3eb14bab0b3a6389dc69cdbf0160b12a3aed287a /extensions
parenta01545cbec992560a5bfe402cf395aabb97d5cfd (diff)
downloadbugzilla-ea1d22b3f6151d7316ef73c4b4f08a4c8b591c72.tar.gz
bugzilla-ea1d22b3f6151d7316ef73c4b4f08a4c8b591c72.tar.xz
Bug 1380531 - Write initial CircleCI configuration for BMO
This is the first (working) iteration of a configuration that allows CircleCI to build 'bmo' docker images that are runnable. Some other changes were required for this: 1. The base image used in Dockerfile was changed from centos:6.7 to mozillabteam/bmo-base:slim. This is a new version of (github) mozilla-bteam/docker-bmo-base which is much smaller, and includes all the system RPMs and other bits that our bmo Dockerfile expects. 2. init.pl mistakenly had '--no-assets' which is not currently a checksetup.pl option. 3. 901-secure-mail-loop.t (which checks for an infinite loop) had to have its timeout increased because CircleCI sometimes is quite slow. 4. version.txt // __version__ now includes build information from CircleCI environmental variables
Diffstat (limited to 'extensions')
-rw-r--r--extensions/BMO/Extension.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index 0f63ffbb4..cb1996cbc 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -2544,8 +2544,11 @@ sub install_filesystem {
my $contribute = eval {
$json->decode(scalar read_file(bz_locations()->{cgi_path} . "/contribute.json"));
};
- my $commit = `git rev-parse HEAD`;
- chomp $commit;
+ my $commit = $ENV{CIRCLE_SHA1};
+ unless ($commit) {
+ $commit = `git rev-parse HEAD`;
+ chomp $commit;
+ }
if (!$contribute) {
die "Missing or invalid contribute.json file";
@@ -2555,7 +2558,7 @@ sub install_filesystem {
source => $contribute->{repository}{url},
version => BUGZILLA_VERSION,
commit => $commit // "unknown",
- build => $ENV{BUGZILLA_CI_BUILD} // "unknown",
+ build => $ENV{CIRCLE_BUILD_NUM} // "unknown",
};
$create_files->{'version.json'} = {