Merge pull request #114 from cloudamatic/the_goog

The Goog

.gitlab-ci.yml

@@ -1,90 +1,94 @@
-before_script:
-  - aws configure set default.region us-east-1
-  - export WORKSPACE=$CI_PROJECT_DIR
-  - echo $WORKSPACE
+image: centos
 
 stages:
-  - clean_up
-  - lint/deploy
-  - foodcritic
-  - test_mu_bok_install
-  - inspec_test
-  - inspec_retry
-  - final_clean
-
-InitialCleanUp:
-  stage: clean_up
-  script:  python test/clean_up.py 
-  only:
-    - master
-  tags:
-    - master
-
+  - Lint
+  - Test
+  - Sec_Test
+  - Smoke_Test
+  - Merge/Tag
+  - Dockerbuild
+  - Deploy
+
 Rubocop:
-  stage: lint/deploy
+  stage: Lint
+  image: chef/chefdk:latest
   script:
-    - rubocop modules
-  only:
-    - master
-  tags:
-    - master
+    - rubocop bin/
+    - rubocop modules/
   allow_failure: true
 
-
+Cookstyle:
+  stage: Lint
+  image: chef/chefdk:latest
+  script:
+    - cookstyle cookbooks/
+  allow_failure: true
+
 Foodcritic:
-  stage: lint/deploy
+  stage: Lint
+  image: chef/chefdk:latest
   script:
-    - foodcritic cookbooks/*
-  only:
-    - master
-  tags:
-    - master
+    - foodcritic cookbooks/
   allow_failure: true
 
-mu_deploy:
-  stage: lint/deploy
+ChefSpec:
+  stage: Test
+  image: chef/chefdk:latest
   script:
-    - bin/mu-deploy -n demo/simple-server-rails.yaml
-  only:
-    - master
-  tags:
-    - master
+    - for d in ./cookbooks/*/ ; do (cd "$d" && chef exec rspec); done
+  allow_failure: true
 
-mu_install_test:
-  stage: lint/deploy
+Rspec:
+  stage: Test
+  image: chef/chefdk:latest
   script:
-    - python test/exec_mu_install.py
-  only:
-    - master
-  tags:
-    - master
-
+    - echo "rspec"
+  allow_failure: true
 
-bok_inspec_test:
-  stage: inspec_test
+.New_Berks:
+  stage: Test
+  image: chef/chefdk:latest
   script:
-    - python test/exec_inspec.py simple-server-rails-test simple-server-rails.yaml
-  only:
-    - master
-  tags:
-    - master
+    - apt-get -qq update
+    - apt-get -qq install git -y
+    - for d in ./cookbooks/*/ ; do (cd "$d" && berks install); done
+    - for d in ./cookbooks/*/ ; do (cd "$d" && berks verify); done
+    - for d in ./cookbooks/*/ ; do (cd "$d" && berks outdated); done
+  allow_failure: true
+
+Berks:
+  stage: Test
+  image: chef/chefdk:latest
+  script:
+    - apt-get -qq update
+    - apt-get -qq install git -y
+    - rm -rf Berksfile.lock
+    - berks install
+    - berks verify
+    - berks outdated
   allow_failure: true
 
+BuildMan:
+  stage: Sec_Test
+  script:
+    - echo "BuildMan!"
+  allow_failure: true
 
-retry_failures:
-  stage: inspec_retry
+Smoke_Test:
+  stage: Smoke_Test
   script:
-    - python test/exec_retry.py 
-  only:
-    - master
-  tags:
-    - master
+    - echo "Insert some of Amrit's Stuff here"
+  allow_failure: true
 
+Merge/Tag:
+  stage: Merge/Tag
+  script:
+    - echo "Merge and tag here"
+  allow_failure: true
 
-final_clean_up:
-  stage: final_clean
+Dockerbuild:
+  stage: Dockerbuild
   script:
-    - python test/clean_up.py
-    - rm -rf /tmp/inspec_retries/*
-    - rm -rf /tmp/*.yml
+    - echo "Build Mu Docker Container"
+  allow_failure: true
 

Berksfile

@@ -1,46 +1,55 @@
+source "https://supermarket.chef.io"
+cookbook_path = "cookbooks"
 
-if !ENV.include?('MU_COOKBOOK_ROOT')
-  if !ENV.include?('MU_LIBDIR')
-	  if !ENV.include?('MU_INSTALLDIR')
-  		raise "Can't find MU_LIBDIR or MU_INSTALLDIR in my environment!"
-	  end
-  	ENV['MU_LIBDIR'] = ENV['MU_INSTALLDIR']+"/lib"
-  end
-  ENV['MU_COOKBOOK_ROOT'] = ENV['MU_LIBDIR']
-end
-cookbookPath = "#{ENV['MU_COOKBOOK_ROOT']}/cookbooks"
-siteCookbookPath = "#{ENV['MU_COOKBOOK_ROOT']}/site_cookbooks"
+# Platform Cookbooks
+cookbook 'mu-activedirectory', path: "#{cookbook_path}/mu-activedirectory"
+cookbook 'mu-splunk', path: "#{cookbook_path}/mu-splunk"
+cookbook 'mu-firewall', path: "#{cookbook_path}/mu-firewall"
+cookbook 'mu-glusterfs', path: "#{cookbook_path}/mu-glusterfs"
+cookbook 'mu-jenkins', path: "#{cookbook_path}/mu-jenkins"
+cookbook 'mu-master', path: "#{cookbook_path}/mu-master"
+cookbook 'mu-mongo', path: "#{cookbook_path}/mu-mongo"
+cookbook 'mu-openvpn', path: "#{cookbook_path}/mu-openvpn"
+cookbook 'mu-php54', path: "#{cookbook_path}/mu-php54"
+cookbook 'mu-tools', path: "#{cookbook_path}/mu-tools"
+cookbook 'mu-utility', path: "#{cookbook_path}/mu-utility"
 
-source "https://supermarket.chef.io"
+# Forked Cookbooks
+cookbook 'awscli', path: "#{cookbook_path}/awscli"
+cookbook 'mysql-chef_gem', path: "#{cookbook_path}/mysql-chef_gem"
+cookbook 'nagios', path: "#{cookbook_path}/nagios"
+cookbook 's3fs', path: "#{cookbook_path}/s3fs"
 
+# Supermarket Cookbooks are an outdated version as of 3/21/18
 cookbook 'apache2', '< 4.0'
 cookbook 'chef-vault', '< 3.0'
+cookbook 'windows', '= 3.2.0'
 cookbook 'aws', '~> 2.9.3'
-cookbook 'awscli', path: "#{cookbookPath}/awscli"
 cookbook 'build-essential', '~> 8.0'
-cookbook 'mu-splunk', path: "#{cookbookPath}/mu-splunk"
+cookbook 'chef_nginx', '~> 6.1.1'
 cookbook 'freebsd', '~> 0.1.9'
-cookbook 'gunicorn', '~> 1.1.2'
+cookbook 'jenkins', '~> 5.0.1'
 cookbook 'logrotate', '~> 1.9.2'
 cookbook 'memcached', '~> 1.7.2'
-cookbook 'chef_nginx', '~> 6.1.1'
-cookbook 'mu-activedirectory', path: "#{cookbookPath}/mu-activedirectory"
-cookbook 'mu-demo', path: "#{cookbookPath}/mu-demo"
-cookbook 'mu-firewall', path: "#{cookbookPath}/mu-firewall"
-cookbook 'mu-glusterfs', path: "#{cookbookPath}/mu-glusterfs"
-cookbook 'mu-jenkins', path: "#{cookbookPath}/mu-jenkins"
-cookbook 'mu-master', path: "#{cookbookPath}/mu-master"
-cookbook 'mu-mongo', path: "#{cookbookPath}/mu-mongo"
-cookbook 'mu-openvpn', path: "#{cookbookPath}/mu-openvpn"
-cookbook 'mu-php54', path: "#{cookbookPath}/mu-php54"
-cookbook 'mu-tools', path: "#{cookbookPath}/mu-tools"
-cookbook 'mu-utility', path: "#{cookbookPath}/mu-utility"
-cookbook 'mysql-chef_gem', path: "#{cookbookPath}/mysql-chef_gem"
-cookbook 'nagios', path: "#{cookbookPath}/nagios"
+cookbook 'mongodb', '~> 0.16.2'
 cookbook 'runit', '~> 1.7'
-cookbook 's3fs', path: "#{cookbookPath}/s3fs"
 cookbook 'zipfile', '~> 0.1.0'
-#cookbook 'hashicorp-vault', '~> 2.5.0', git: "https://github.com/johnbellone/vault-cookbook"
-cookbook 'demo', path: "#{siteCookbookPath}/demo"
-cookbook 'windows', '= 3.2.0'
-#cookbook 'omnibus-gitlab', '~> 0.3.28', git: "https://gitlab.com/gitlab-org/cookbook-omnibus-gitlab.git"
+cookbook 'yum', '~> 3.0'
+
+# Supermarket Cookbooks that are using latest as of 3/21/18
+cookbook 'bind', '~> 2.2.0'
+cookbook 'bind9-ng', '~> 0.1.0'
+cookbook 'consul-cluster', '~> 2.0.0'
+cookbook 'database', '~> 6.1.1'
+cookbook 'firewall', '~> 2.6.3'
+cookbook 'hostsfile', '~> 3.0.1'
+cookbook 'java', '~> 1.50.0'
+cookbook 'mysql', '~> 8.5.1'
+cookbook 'nrpe', '~> 2.0.3'
+cookbook 'oracle-instantclient', '~> 1.1.0'
+cookbook 'poise-python', '~> 1.6.0'
+cookbook 'postfix', '~> 5.2.1'
+cookbook 'postgresql', '~> 6.1.1'
+cookbook 'simple_iptables', '~> 0.8.0'
+cookbook 'vault-cluster', '~> 2.1.0'
+cookbook 'yum-epel', '~> 3.1.0'