harmonize

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
     docker:
       - image: alpine:latest
         environment:
-          S3_BUCKET: moz-devservices-bmocartons
+          S3_BUCKET: bugzilla-cartons
     steps:
       - run:
           command: |
@@ -33,7 +33,7 @@ jobs:
       - image: centos:6.9
         environment: 
           PATH: /build/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
-          NAME: bmo # named this for historical reasons
+          NAME: centos6
     steps:
       - checkout
       - run:
@@ -52,89 +52,28 @@ jobs:
             - "*/vendor.tar.gz"
       - store_artifacts:
           path: '/root/.cpanm/work/*/build.log'
-  ubuntu14:
-    working_directory: /build
-    docker:
-      - image: ubuntu:14.04
-        environment:
-          PATH: /build/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
-          NAME: mozreview # named this for historical reasons
-    steps:
-      - checkout
-      - run:
-          command: cp /build/bundle/ubuntu14/mysql.list /etc/apt/sources.list.d/mysql.list
-      - run:
-          name: install dependencies
-          command: /build/bundle/ubuntu14/install-debs
-      - run:
-          name: copy cpanfile and cpanfile.snapshot
-          command: cp bundle/$CIRCLE_JOB/cpanfile* .
-      - run: build-prepare
-      - run: build-stage1
-      - run: build-stage2
-      - run: build-vendor-bundle $NAME
-      - persist_to_workspace:
-          root: /build/upload
-          paths:
-            - "*/vendor.tar.gz"
-      - store_artifacts:
-          path: '/root/.cpanm/work/*/build.log'
-  bmo-base:
+  harmony-slim:
     working_directory: /build
     docker:
       - image: docker:17.06.1-ce
         environment:
-          DOCKERHUB_REPO: mozillabteam/bmo-base
+          DOCKERHUB_REPO: bugzilla/harmony-slim
           PATH: /build/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
     steps:
       - setup_remote_docker
       - checkout
       - attach_workspace:
           at: /build/upload
       - run:
-          no_output_timeout: 20m
-          working_directory: /build/docker/bmo-base
-          command: |
-            tar -zxf /build/upload/bmo/vendor.tar.gz bmo/vendor/ bmo/cpanfile bmo/cpanfile.snapshot
-            docker-build
-  bmo-ci:
-    working_directory: /build
-    docker:
-      - image: docker:17.06.1-ce
-        environment:
-          DOCKERHUB_REPO: mozillabteam/bmo-ci
-          PATH: /build/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
-    steps:
-      - setup_remote_docker
-      - checkout
-      - run:
-          working_directory: /build/docker/bmo-ci
+          working_directory: /build/docker/harmony-slim
           command: |
-            docker-build
-      - run:
-          command: docker run -ti $DOCKERHUB_REPO env GITHUB_BASE_BRANCH=production TEST_SUITE=sanity runtests.sh
-  bmo-slim:
-    working_directory: /build
-    docker:
-      - image: docker:17.06.1-ce
-        environment:
-          DOCKERHUB_REPO: mozillabteam/bmo-slim
-          PATH: /build/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
-    steps:
-      - setup_remote_docker
-      - checkout
-      - attach_workspace:
-          at: /build/upload
-      - run:
-          working_directory: /build/docker/bmo-slim
-          command: |
-            tar -zxf /build/upload/bmo/vendor.tar.gz \
-              bmo/vendor/bin \
-              bmo/local \
-              bmo/cpanfile \
-              bmo/cpanfile.snapshot \
-              bmo/LIBS.txt \
-              bmo/PACKAGES.txt
+            tar -zxf /build/upload/harmony/vendor.tar.gz \
+              harmony/vendor/bin \
+              harmony/local \
+              harmony/cpanfile \
+              harmony/cpanfile.snapshot \
+              harmony/LIBS.txt \
+              harmony/PACKAGES.txt
             docker-build
   
   docker-centos6:
@@ -151,21 +90,6 @@ jobs:
           name: build docker container
           command: |
             docker-build -f bundle/centos6/Dockerfile
-  docker-ubuntu14:
-    working_directory: /build
-    docker:
-      - image: docker:17.06.1-ce
-        environment:
-          DOCKERHUB_REPO: mozillabteam/ubuntu14
-          PATH: /build/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
-    steps:
-      - setup_remote_docker
-      - checkout
-      - run:
-          name: build docker container
-          command: |
-            docker-build -f bundle/ubuntu14/Dockerfile
-  
 
 workflows:
   version: 2
@@ -175,42 +99,21 @@ workflows:
           filters:
             branches:
               only: master
-      - docker-ubuntu14:
-          filters:
-            branches:
-              only: master
   bundles:
     jobs:
       - centos6:
           filters:
             branches:
               only: master
-      - ubuntu14:
-          filters:
-            branches:
-              only: master
-      - bmo-slim:
+      - harmony-slim:
           filters:
             branches:
               only: master
           requires:
             - centos6
-      - bmo-base:
-          filters:
-            branches:
-              only: master
-          requires:
-            - centos6
-      - bmo-ci:
-          filters:
-            branches:
-              only: master
-          requires:
-            - bmo-base
       - upload:
           filters:
             branches:
               only: master
           requires:
             - centos6
-            - ubuntu14

Makefile

@@ -1,5 +1,5 @@
 BRANCH = $(error must specify BRANCH)
-REPO   = mozilla-bteam/bmo
+REPO   = bugzilla/harmony
 
 all: bundle/centos6/cpanfile bundle/ubuntu14/cpanfile
 
@@ -9,13 +9,6 @@ centos6.tar.gz: Makefile
 		--env REPOSITORY="https://github.com/$(REPO).git" \
 		--name centos6 mozillabteam/centos6 > $@
 
-ubuntu14.tar.gz: Makefile
-	docker run --rm -i \
-		--env BRANCH=$(BRANCH) \
-		--env REPOSITORY="https://github.com/$(REPO).git" \
-		--name ubuntu14 mozillabteam/ubuntu14 > $@
-
-
 bundle/%/cpanfile bundle/%/cpanfile.snapshot: %.tar.gz
 	tar -zxf $< -C bundle/$* cpanfile cpanfile.snapshot
 	touch bundle/$*/{cpanfile,cpanfile.snapshot}

bin/build-vendor-bundle

@@ -21,4 +21,4 @@ tar --transform "s@^@$NAME/@" \
     cpanfile \
     cpanfile.* \
     local \
-    vendor
+    uendor