diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..32acf6c
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,11 @@
+{
+ "image": "aemdesign/java-buildpack:jdk11",
+ "workspaceMount": "source=${localWorkspaceFolder},target=/build/source,type=bind",
+ "workspaceFolder": "/build/source",
+ "extensions": [
+ "mutantdino.resourcemonitor"
+ ],
+ "mounts": [
+ "source=${localEnv:HOME}${localEnv:USERPROFILE}/.m2/,target=/build/.m2/,type=bind,consistency=cached"
+ ]
+}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ce5ba29..48849b1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on: [push]
jobs:
build:
-
+ if: "!contains(github.event.head_commit.message, 'skip ci')"
runs-on: ubuntu-latest
strategy:
max-parallel: 4
@@ -12,7 +12,12 @@ jobs:
python-version: [3.6]
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v2
+ with:
+ submodules: true
+ lfs: true
+ ref: ${{ github.head_ref }}
+ fetch-depth: 0
- name: set up python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
diff --git a/.gitignore b/.gitignore
index e2f3e68..b8129ce 100755
--- a/.gitignore
+++ b/.gitignore
@@ -61,4 +61,6 @@ devops___*
.bash_history
#ignore selenium jars
-selenium-server-*
\ No newline at end of file
+selenium-server-*
+
+.vscode
diff --git a/.gitmodules b/.gitmodules
index 19ff7a7..77e36a9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
[submodule "aemdesign-aem-core"]
path = aemdesign-aem-core
- url = git@github.com:aem-design/aemdesign-aem-core.git
+ url = https://github.com/aem-design/aemdesign-aem-core.git
+ branch = master
[submodule "aemdesign-aem-support"]
path = aemdesign-aem-support
- url = git@github.com:aem-design/aemdesign-aem-support.git
-[submodule "aemdesign-archetype"]
- path = aemdesign-archetype
- url = git@github.com:aem-design/aemdesign-archetype.git
+ url = https://github.com/aem-design/aemdesign-aem-support.git
+ branch = master
[submodule "aemdesign-operations"]
path = aemdesign-operations
- url = git@github.com:aem-design/aemdesign-operations.git
+ url = https://github.com/aem-design/aemdesign-operations.git
+ branch = master
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index bdd566d..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-language: java
-services: docker
-sudo: false
-cache:
- directories:
- - '$HOME/.m2/repository'
-
-git:
- depth: false
- submodules: false
-
-before_install:
- - echo SWTICH TO PYTHON3
- - pyenv install 3.6.3
- - pyenv global 3.6.3
- - pip3 install ansible
- - echo UPDATE SUBMODULES
- - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
- - git submodule update --init
- - git submodule foreach "if [[ -f '.gitmodules' ]]; then sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules; git submodule foreach update --init; fi"
-
-install:
- - ls -l
-
-#Create new project and build it to see if it works
-script:
- - ./devops
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..0c04c53
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "cmake.configureOnOpen": false
+}
diff --git a/README.md b/README.md
index d223881..22c5d2d 100644
--- a/README.md
+++ b/README.md
@@ -6,256 +6,40 @@ AEM Design Parent
[](https://github.com/aem-design/aemdesign-parent)
[](https://github.com/aem-design/aemdesign-parent)
[](https://github.com/aem-design/aemdesign-parent)
-[](https://github.com/aem-design/aemdesign-parent)
+[](https://github.com/aem-design/aemdesign-parent)
+[](https://aem.design/)
+[](https://gitter.im/aem-design/Lobby)
-This project is used to facilitate packaging and deployment of AEM projects and related tech.
+## Prerequisites
-***
-
-PLEASE ENSURE THAT YOU STUDY THE README, DO NOT SKIM OVER THIS AS THERE IS A LOT OF MOVING PARTS YOU WONT KNOW ABOUT
-PLEASE ENSURE THAT ALL PREREQUISITES ARE INSTALLED BEFORE DOING ANYTHING, OTHERWISE YOU WILL HAVE ISSUES YOU WILL NEED TO ANALYSE AND FIX ON YOUR OWN
-YOUR BASH AND TEAM MATES WILL THANK YOU!!!
-
+You need:
-***
+1. Docker
+2. Java 8 or 11.
-# Preamble
+## Developer Setup
-**_BIG NOTE: DevOps by default will send output log of all operations to Slack!_**
-
-Please check channel ```devops-builds``` in ```aem.design``` slack!
-
-This will make it easier for everyone to trouble shoot.
-
-# Project A-B-C's
-
-Overall process of getting your local environment setup for development
-
-- A. Get your perquisites ready - setup dependencies, use ```./devops``` as a test if ok
-- B. Run ```./devops buildlocaldev``` - this will build a vm and add it to Virtual box and configure it to be used locally and deploy all services.
-- C. Run playbooks in deploy project
-- D. Read the [AEM.Design Principles](docs/README-PRINCIPLES.md) before you start inventing the wheel again
-
-
-# Pre-Requisites
-
-This project was built for Linux, Mac Osx and Windows (Cygwin and Bash on Ubuntu on Windows).
-
-**Following is the map of logic around getting started:**
-
-
-
-
-
-# Getting Started Approach
-
-* [Get some soft](#get-some-soft) (https://www.youtube.com/watch?v=KpWqTjLn7Fg)
-* [Setup SSH and GPG setup on Gitlab](docs/README-SSH-GPG.md) **IMPORTANT: ALL NON VERIFIED COMMITS WILL BE REJECTED**
-* Choose your Setup, ***pick one*** that matches your machine config
- * **PLEASE ENSURE THAT** ```./devops``` RETURNING **OK** FOR ALL PREREQUISITES BEFORE CONTINUING, if you find missing dependencies please raise a PR ot this readme after you update the [Dependencies Table](#dependencies-table)
- * [Mac](docs/README-MAC.md) - PREFERRED - you run Mac as your main OS
- * [Windows Docker] - PREFERRED - you have docker setup
- * [Ubuntu](docs/README-UBUNTU.md) - you run Ubuntu as a main OS
- * [Windows 10 Dual Account](docs/README-WIN10-DualAccount.md) - EXPERIMENTAL - is you have dual account please follow this
- * [Windows 10 Bash](docs/README-WIN10-BASH.md) - EXPERIMENTAL - preferred if you run Windows 10 as main OS
- * [Windows 10 Cygwin](docs/README-WIN10-CYGWIN.md) - EXPERIMENTAL - you run Windows 10 as main OS but wan't Cygwin
-* Proceed to [Ready to Roll](#ready-to-roll) once you have all Pre-Requisites installed
-* If you run into issues check [Troubleshooting](docs/README-FAQ.md) before you create an issue
-* Check out [Repo Info](#repos-info) section to see project descriptions
-* Start by checking out [Contributing](docs/README-CONTRIBUTING.md) info
-
-
-
-## Get some soft
-
-### Software you will need before you start!
-
-####Dependencies Table
-
-
-***
-
-Please DO NOT install apps into paths with Spaces
-YOUR BASH WILL THANK YOU!!!
-***
-
-Download and install following dependencies, please see following table for help on how to install these:
-
-```
-[OK] java 1.8.0_202 1.8.0+
-[OK] mvn 3.6.0 3.5.0+
-[OK] unzip 6.00 6.00+
-[OK] git 2.21 2.4.0+
-[OK] git-lfs 2.7.1 2.0.0+
-[OK] node 1.11 8.1.3+
-[OK] npm 6.7.0 2.12.1+
-[OK] curl 7.54.0 7.35.0+
-[OK] imagemagick 7.0.8-32 7.0.7+
-[OK] realpath 8.31 8.29+
-[OK] python2 2.7.16 2.7.10+
-[OK] python3 3.7.2 3.6.1+
-[OK] pip 19.0.3 7.0.0+
-[OK] virtualenv 16.4.3 15.1.0+
-[OK] ansible 2.5.15 2.4.1.0+
-[OK] ansible-playbook 2.5.15 2.4.1.0+
-[OK] VBox 6.0.4r128413 5.2.24+
-[OK] VBox Ext 6.0.4 5.2.24+
-[OK] netcat ok ok+
-[OK] groovy 5.6 2.5.3+
-[OK] bundle 2.0.1 2.0.1+
-[OK] socat 1.7.3.2 1.7.3.2+
-```
-
-How to install dependencies:
-
-| Manual Install On Platform | Software | Purpose | Location | Add to System Path | Script Executable [1](#f1) |
-|:---: |----------------|----------|----------| :---: |-------------------|
-| LINUX | [Virtual Box](https://www.virtualbox.org/wiki/Downloads) | used for creating VM Docker Host | | Yes | ```VirtualBox``` |
-| LINUX | [Virtual Box Ext](https://www.virtualbox.org/wiki/Downloads) | allows automation of VM | | Yes | |
-| LINUX | [Maven](https://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/) | used as build automation | | Yes | ```mvn``` |
-| LINUX | [Java JDK8](http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-windows-x64.exe?AuthParam=1493724079_cdb2ad47b66a10357fd9749f14b1d8e4) | check latest versions [here](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) | | Yes | ```java``` |
-| LINUX | [Nodejs](https://nodejs.org/dist/v6.10.3/) | used for prototype | | Yes | ```node``` |
-| LINUX | [Git LFS](https://git-lfs.github.com/) | need it for binaries | | Yes | ```git-lfs``` |
-| LINUX | [FFmpeg](https://www.ffmpeg.org/) | for local AEM instance | | Yes | ```ffmpeg``` |
-| LINUX | [Groovy](http://groovy-lang.org/install.html) | or running groovy scripts | | Yes | ```groovy``` |
-| CYGWIN | [Imagemagick](http://www.imagemagick.org/) | for comparing screenshots while testing | | Yes | ```compare``` |
-| CYGWIN | [Virtual Box](https://www.virtualbox.org/wiki/Downloads) | used for creating VM Docker Host | ```C:\shared\apps\Oracle\VirtualBox``` | Yes | ```VirtualBox``` |
-| CYGWIN | [Virtual Box Ext](https://www.virtualbox.org/wiki/Downloads) | allows automation of VM | | Yes | |
-| CYGWIN | [Java JDK8](http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-windows-x64.exe?AuthParam=1493724079_cdb2ad47b66a10357fd9749f14b1d8e4) | check latest versions [here](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) | ```C:\shared\apps\Java\jdk1.8.0_131``` | Yes | ```java``` |
-| CYGWIN | [Maven](https://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/) | used as build automation | ```C:\shared\apps\apache-maven-3.5.0\bin```| Yes | ```mvn``` |
-| CYGWIN | [Nodejs](https://nodejs.org/dist/v6.10.3/) | used for prototype | ```C:\shared\apps\node-v6.10.2-win-x64``` | Yes | ```node``` |
-| CYGWIN | [Git LFS](https://git-lfs.github.com/) | need it for binaries | ```C:\Program Files\Git LFS``` | Yes | ```git-lfs``` |
-| CYGWIN | [Unzip](http://gnuwin32.sourceforge.net/packages/unzip.htm) | need it for binaries | ```C:\unzip``` | Yes | ```unzip``` |
-| CYGWIN | [FFmpeg](https://www.ffmpeg.org/) | for local AEM instance | | Yes | ```ffmpeg``` |
-| CYGWIN | [Imagemagick](http://www.imagemagick.org/) | for comparing screenshots while testing | | Yes | ```compare``` |
-| CYGWIN | [Groovy](http://groovy-lang.org/install.html) | or running groovy scripts | | Yes | ```groovy``` |
-| MAC | [Brew](https://brew.sh/) | need it on mac in general | ```/usr/local/bin/brew``` | Yes | ```brew``` |
-| MAC | ```brew install node@8``` | used for prototype | ```C:\shared\apps\node-v6.10.2-win-x64``` | Yes | ```node``` |
-| MAC | ```brew cask install java8``` | | | Yes | ```java``` |
-| MAC | ```brew install git-lfs``` | need it for binaries | | Yes | ```git-lfs``` |
-| MAC | ```git lfs install``` | need it to initialise git-lfs | | Yes | ```git-lfs``` |
-| MAC | ```brew install coreutils``` | need it for realpath | | Yes | ```realpath``` |
-| MAC | ```brew install maven``` | used as build automation | | Yes | ```mvn``` |
-| MAC | ```brew cask install virtualbox``` | used for creating VM Docker Host | | Yes | ```VirtualBox``` |
-| MAC | ```brew cask install virtualbox-extension-pack``` | allows automation of VM | | Yes | |
-| MAC | ```brew install ffmpeg``` | for local AEM instance | | Yes | ```ffmpeg``` |
-| MAC | ```brew install imagemagick``` | for comparing screenshots while testing | | Yes | ```compare``` |
-| MAC | ```brew install groovy``` | for running groovy scripts | | Yes | ```groovy``` |
-| MAC | ```brew install socat``` | for running groovy scripts | | Yes | ```groovy``` |
-| MAC | ```brew cask install docker && brew install bash-completion docker-completion docker-compose-completion docker-machine-completion``` | for running containers | | Yes | ```docker``` |
-| MAC | ```export PIP_REQUIRE_VIRTUALENV=false pip install virtualenv virtualenvwrapper``` | for python environments to store dependencies | | Yes | ```workon``` |
-
-
-### Software Installation Notes:
-Virtual Box: - Turn off other Virtual Box programs
- - Run VBox as admin to install extensions
- - Change Default Machine Folder dir so there are no spaces in folder names
-
-1 - This command line is hardcoded in all scripts, run ```./devops``` to test your dependencies. [↩](#a1)
-
-# Ready to Roll
-
-Chose your path
-
-- [Quick using Docker](#quick-path-using-docker) - I don't want to deep-dive but I want to use this awesomeness!
-- [Quick using VirtualBox](#quick-path-using-docker) - let's get this show on the road!
-- [Manual](#manual-path) - I've got this!
-
-## Overview
-
-Following is the map of commands and important artifacts and steps that you need to be aware of:
-
-
-
-
-
-* VM Keys are generated for you only and added to the VM during Build Process, these same keys you will use to access the VM, for PROD use these should be provided.
-
-
-## Quick Path using Docker
-Quick path to getting Docker containers deployed on your local Docker Host, this will only setup Author and Selenium Hub in a docker container.
-
-- clone parent repo
-
-```bash
-git clone --recursive git@gitlab.com:aem.design/aemdesign-parent.git
-```
-
-- Verify dependencies (some missing dependencies will be installed using install steps)
-
-```bash
-./devops
-```
-
-- Start quickstart this will run clone, install and buildlocaldev in one step, good for testing end to end process
-
-```bash
-./devops dockerlocaldev
-```
-
-
-
-
-## Quick Path using VirtualBox
-Quick path to getting VM built with project deployed, this uses all command in order to build a VM for first time users only.
-
-- clone parent repo
-
-```bash
-git clone --recursive git@gitlab.com:aem.design/aemdesign-parent.git
-```
-
-- Verify dependencies (some missing dependencies will be installed using install steps)
-
-```bash
-./devops
-```
-
-- Start quickstart this will run clone, install and buildlocaldev in one step, good for testing end to end process
-
-```bash
-./devops quickstart
-```
-
-
-## Manual Path
-Manually run commands to get a vm built, will help you learn commands
-
-- clone parent repo
-
-```bash
-git clone --recursive git@gitlab.com:aem.design/aemdesign-parent.git
-```
-
-- Verify dependencies, this will show you if you are missing dependencies
+1. For best experience see [Developer Setup](docs/SETUP.md)
+2. Clone parent repo
```bash
-./devops
+git clone --recursive git@github.com:aem-design/aemdesign-parent.git
```
-- Clone child projects, if you dont have them
+3. Start AEM Stack
```bash
-./devops clone
+docker-compose up
```
-- Install dependencies, if you have missing dependencies run following
+4. Deploy Core and Support
```bash
-./devops install
+docker-compose up author-deploy-core author-deploy-support
```
-
-NOTE: install will run buildlocaldev after 10sec timeout
-
-- build local VM and deploy containers
-
-```bash
-./devops buildlocaldev
-```
-
-- Post some screenshots on your blog when is done :)
+5. Open `http://localhost` and access Services :D
# Repos Info
@@ -271,95 +55,28 @@ For more information see [Project Artifacts](http://aem.design/manifesto/project
| aemdesign-operations/ | operations and deployment projects |
| aemdesign-archetype/ | archetype project for new projects |
-#Container Logs
+## Container Logs
-You can monitor logs of containers by either using Docker container logs interface or manually tail using docker exec
-
-Here is an example of monitoring error log on author
-
-If you have deployed the config repo it would have forced all logs to output to container console, this is done to allow easy collection of logs from containers.
-
-You can monitor container out put using following command
+You can monitor logs of containers by either using Docker container logs interface or manually using docker:
```bash
-docker logs -f author
+docker logs -f aemdesign-parent_author_1
```
If your container is not configured to output all log to console then you can use the exec to tail the logs directly
```bash
-docker exec -it author tail -f crx-quickstart/logs/error.log
+docker exec -it aemdesign-parent_author_1 tail -f crx-quickstart/logs/error.log
```
-
-#DevOps Script Commands
-
-Usage for script
+Tail container log from a specific date
```bash
- ./devops {action} {action_params ...}
+docker logs -ft aemdesign-parent_author_1 --since 2019-01-18
```
-| Command | Description |
-|:---: |--- |
-| help | show help |
-| quit | show nice logo |
-| install | install of dependencies run as ROOT |
-| clone | get configured repos |
-| pull | get updates for all repos |
-| push | push changes for all repos |
-| status | view changes for all repos |
-| buildpr | build prototype |
-| buildlocaldev | build a VM for development |
-| accesslocal | ssh into local VM |
-| deploylocaldev | run a playbook to deploy services to localdev |
-| stashlist | show list of stash for all repos |
-| quickstart | automated run from freshly cloned parent repo |
-| resetrepos | reset all repos to master |
-| checkout | checkout a branch on all submodules |
-| stash | stash on all submodules |
-| stash pop | stash pop on all submodules |
-| dockerlocaldev | build localdev using local docker |
-
-### Local AEM Instance Command
+You can remove container logs like this
-***Please use Docker instead see ```./devops dockerlocaldev``` command***
-
-For the commands below refer for module specific setup in aemdesign-operations/aemdesign-aem/README.md
-
-| Command | Description |
-|:---: |--- |
-| startaut | run author nodev |
-| startpub | run publisher node |
-| startauthpub | run author and publisher nodes together |
-| stopaut | stop author node. |
-| stoppub | stop publisher node |
-| stopauthpub | run author and publisher nodes together |
-
-
-# Process: Build a VM for development
-
-Following is the the structure of the VM ```buildlocaldev``` process:
-
-* Setup Shell ENV
-* Check Env Settings
-* Setup Process Variables
-* Verify if VM Appliance is already configured
-* Check VirtualBox config
-* Update VirtualBox Network settings
-* IF Required Build Appliance using Packer
-* IF Required Import Appliance as a VM
-* IF Required Start VM
-* Check if VM is configured
-* IF Required upload AEM Jar to Nexus
-* Run Ansible Site playbook
-
-NOTE: If Ansible playbook fails you need restart the process
-
-# Docker
-
-Tail container log from latest date
-
-```bash
-docker logs -ft author --since 2019-01-18
+```powershell
+docker run --rm -v /var/lib/docker:/var/lib/docker alpine sh -c "echo '' > $(docker inspect --format='{{.LogPath}}' aemdesign-parent_author_1)"
```
diff --git a/aemdesign-aem-core b/aemdesign-aem-core
index c02ec1e..f817de6 160000
--- a/aemdesign-aem-core
+++ b/aemdesign-aem-core
@@ -1 +1 @@
-Subproject commit c02ec1eb4d7c8bf0eba15ff925695792e9feaab3
+Subproject commit f817de646b5d69958bd126c16690fdb0fad7500f
diff --git a/aemdesign-aem-support b/aemdesign-aem-support
index cab4624..f1aadc2 160000
--- a/aemdesign-aem-support
+++ b/aemdesign-aem-support
@@ -1 +1 @@
-Subproject commit cab46248e00cd195b0c926aa0f0f14dd07ee69c6
+Subproject commit f1aadc2ac13067a79ae290aedbc9e626c8238bd0
diff --git a/aemdesign-archetype b/aemdesign-archetype
deleted file mode 160000
index c22a637..0000000
--- a/aemdesign-archetype
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c22a637b5f1d17a621dcf084699cd9bd2d8f4cea
diff --git a/aemdesign-operations b/aemdesign-operations
index d52ec4c..2188415 160000
--- a/aemdesign-operations
+++ b/aemdesign-operations
@@ -1 +1 @@
-Subproject commit d52ec4cb952076a9851c20d0287aff108568b56b
+Subproject commit 21884158960bbd02174f88994cf6d111aba7cb78
diff --git a/check_maven b/check_maven
deleted file mode 100755
index 170a798..0000000
--- a/check_maven
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [[ "$(echo $MAVEN_OPTS | grep trustStore)" == "" ]]; then
- echo "Please see README.MD to setup your MAVEN_OPTS with valid trustStore."
- exit 1
-fi
-
diff --git a/clone b/clone
deleted file mode 100755
index a06f9c3..0000000
--- a/clone
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-git submodule sync
-git submodule update --init --recursive --remote
\ No newline at end of file
diff --git a/config.toml b/config.toml
deleted file mode 100644
index ab689f1..0000000
--- a/config.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[[runners]]
- limit = 0
diff --git a/default.xml b/default.xml
deleted file mode 100755
index 537fe9b..0000000
--- a/default.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
- ${user.home}/.m2/repository
- true
-
-
- adobe-public
-
- true
-
-
- adobe-public-releases
- Adobe Public Releases
- http://repo.adobe.com/nexus/content/groups/public
-
-
-
- adobe-public-releases
- Adobe Basel Public Repository
- http://repo.adobe.com/nexus/content/groups/public
-
- true
- never
-
-
- false
-
-
-
-
-
- adobe-public-releases
- Adobe Basel Public Repository
- http://repo.adobe.com/nexus/content/groups/public
-
- true
- never
-
-
- false
-
-
-
-
-
-
- adobe-public
-
-
\ No newline at end of file
diff --git a/deploy b/deploy
deleted file mode 100755
index 1cabd3b..0000000
--- a/deploy
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-SCRIPT_PARAMS="$@"
-
-source "./scripts/functions-debug.sh"
-source "./scripts/functions-maven.sh"
-source "./scripts/functions-curl.sh"
-
-
-set_term_title "Turn-off Workflows"
-echo "- Workflows Turn-off"
-doWorkflowsTurnOff
-
-
-set_term_title "Deploying Monolith Package: mvn -Dvault.useProxy=false -DskipTests -e -U -P deploymentpackage clean install "
-echo "- Deploy"
-mvn -Dvault.useProxy=false -DskipTests -e -U -P deploymentpackage,installdeploymentpackage clean install "$@"
-set_term_title "Deployed"
-
-
-set_term_title "Turn-on Workflows"
-echo "- Workflows Turn-on "
-doWorkflowsTurnOn
-
-
-set_term_title "Clear Cache"
-echo "- Clear Cache"
-doCacheClear
-
-set_term_title "Deployed"
-echo "- Deployed"
\ No newline at end of file
diff --git a/deploy-aws b/deploy-aws
deleted file mode 100755
index 3918ce2..0000000
--- a/deploy-aws
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-AEM_USER=${1:?Please specifiy a username}
-AEM_PASS=${2:?Please specifiy a password}
-AEM_HOST=54.153.160.42
-
-./deploy -Dcrx.host=${AEM_HOST} -Dcrx.username=${AEM_USER} -Dcrx.password=${AEM_PASS}
diff --git a/deploy-local b/deploy-local
deleted file mode 100755
index 2a6faa7..0000000
--- a/deploy-local
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-./deploy -Dcrx.host=localhost
diff --git a/deploy-publish b/deploy-publish
deleted file mode 100755
index 73ba1db..0000000
--- a/deploy-publish
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-./deploy -Dcrx.port=4503
diff --git a/deploy-publish-local b/deploy-publish-local
deleted file mode 100755
index 2e70766..0000000
--- a/deploy-publish-local
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-./deploy -Dcrx.host=localhost -Dcrx.port=4503
diff --git a/devops b/devops
deleted file mode 100755
index daf2bd7..0000000
--- a/devops
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-
-TIMESTAMP=$(date +"%s")
-LOGS_DIR="logs"
-ENABLE_LOG=yes
-
-if [ ! -d "$LOGS_DIR" ]; then
- mkdir $LOGS_DIR
-fi
-
-LOGFILE="$LOGS_DIR/devops_${TIMESTAMP}.log"
-
-if [[ "$*" == "" ]]; then
- ENABLE_LOG=no
-else
- echo "LOGGING TO FILE: ${LOGFILE}"
-fi
-
-function lowercase() {
- echo "$1" | awk '{print tolower($0)}'
-}
-
-function LOG() {
- if [[ "$ENABLE_LOG" == "no" ]]; then
- echo "$*"
- else
- echo "$*">>"$LOGFILE"
- fi
-}
-
-#SLACK_WEBHOOK_URL="https://hooks.slack.com/services/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"
-SLACK_CHANNEL="devops-builds"
-#SLACK_USERNAME="devops"
-SLACK_TOKEN="xoxp-161276080816-162664008390-195988130864-812196137553bc39e2524e23a602e8aa"
-SLACK_UPLOAD_URL="https://slack.com/api/files.upload"
-
-OS=$(lowercase "$(uname)")
-
-INFO_CPU=""
-INFO_MEM=""
-INFO_OS="$(uname -srvmp)"
-INFO_OS_SHORT="$(uname)"
-
-if [[ "$OS" == "windowsnt" || "$OS" == *"mingw"* || "$OS" == *"cygwin"* ]]; then
- INFO_CPU="$(grep "model name" /proc/cpuinfo | head -1 | awk -F ": " '{ print $2 }')"
- INFO_OS="${INFO_OS} - $(cmd /c ver)"
- INFO_MEM="$(free | awk '/^Mem:/{print $2}')"
-elif [ "$OS" == "linux" ]; then
- INFO_CPU="$(grep "model name" /proc/cpuinfo | head -1 | awk -F ": " '{ print $2 }')"
- INFO_MEM="$(free | awk '/^Mem:/{print $2}')"
-elif [ "$OS" == "darwin" ]; then
- INFO_CPU="$(sysctl -n machdep.cpu.brand_string)"
- INFO_MEM="$(system_profiler SPHardwareDataType | grep " Memory:" | awk -F ": " '{ print $2 }')"
-fi
-
-TITLE="devops build by $(whoami) on $(date)"
-
-if [[ "$ENABLE_LOG" == "no" ]]; then
- ./devops-cli "$@"
-else
-
- LOG "User: $(whoami)"
- LOG "CPU: ${INFO_CPU}"
- LOG "MEM: ${INFO_MEM}"
- LOG "OS: ${INFO_OS}"
- LOG "CMD: ./devops $*"
- LOG "START: $(date)"
- LOG "=========================================="
-
- ./devops-cli "$@" | tee -ai "$LOGFILE"
-
- LOG "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
- LOG "END: $(date)"
- LOG "=:SUMMARY:================================="
- LOG "$(grep -i error "${LOGFILE}")"
-
- ERRORS_COUNT=$(grep -ic error "${LOGFILE}")
- SUCCESS_COUNT=$(grep -c "failed=0" "${LOGFILE}")
- CHANGED_COUNT=$(grep -c "changed=" "${LOGFILE}")
-
- if [ ! -z "$CHANGED_COUNT" ]; then
- DEPLOY_STATUS="Success: ${SUCCESS_COUNT} of ${CHANGED_COUNT}; "
- fi
-
-
- if [ ! -z "$HUBOT_SLACK_TOKEN" ]; then
- #get bot info
- #https://slack.com/api/auth.test?token=
- BOT_API_URL="https://slack.com/api/auth.test?token=$HUBOT_SLACK_TOKEN"
- BOT_INFO="$(curl "$BOT_API_URL")"
- BOT_NAME="$(echo "$BOT_INFO" | sed -ne 's/.*"user":"\(.*\)","team.*/\1/p')"
- BOT_ID="$(echo "$BOT_INFO" | sed -ne 's/.*"user_id":"\(.*\)".*/\1/p')"
- USER_INFO="BOT: ${BOT_NAME}($BOT_ID); "
- else
- USER_INFO="USER: $(whoami); "
- fi
-
- INITIAL_COMMENT="${USER_INFO}Command: $*; ${DEPLOY_STATUS}OS: ${INFO_OS_SHORT}; Errors: ${ERRORS_COUNT}"
-
-fi
-
-
-if [[ "$ENABLE_LOG" == "no" ]]; then
- echo -e "\nNothing to send, not recording.\n"
-else
- echo -e "Sending ${LOGFILE} to [${SLACK_CHANNEL}] channel in slack.\n\n"
- #send logfile to slack
- curl -F file=@"${LOGFILE}" -F channels="${SLACK_CHANNEL}" -F filetype=text -F title="${TITLE}" -F initial_comment="${INITIAL_COMMENT}" -F token="${SLACK_TOKEN}" "${SLACK_UPLOAD_URL}"
- echo -e "\n\nThanks!"
-fi
-
-#done
-exit 0;
-
diff --git a/devops-cli b/devops-cli
deleted file mode 100755
index 4c0498e..0000000
--- a/devops-cli
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/bash
-
-#read defaults before script starts
-export DEFAULT_USER_PROFILE="$HOME/.bash_profile"
-echo "DEFAULT_PROFILE_FILE=$DEFAULT_USER_PROFILE"
-DIR_INC="$(pwd -P)/scripts"
-echo "DIR_INC=$DIR_INC"
-DIR_ROOT="$(pwd -P)"
-echo "DIR_ROOT=$DIR_ROOT"
-ACTION="$1"
-ACTION_PARAMS="${*:2}"
-echo "ACTION=${ACTION}"
-echo "ACTION_PARAMS=${ACTION_PARAMS}"
-
-source ./scripts/functions.sh
-
-debug "OS=${OS}" "info"
-
-#doProjectInstall(PROJECT_TITLE,PROJECT_DIR)
-function doProjectInstall() {
- local PROJECT_TITLE=${1?Need project title}
- local PROJECT_DIR=${2?Need project path}
-
- debug "Installing $PROJECT_TITLE" "info"
- if [ -d "$PROJECT_DIR" ]; then
- cd "$PROJECT_DIR" && ./install && cd - || return
- else
- debug "Project $PROJECT_TITLE not found at location $PROJECT_DIR" "error"
- fi
-}
-
-function doDependencyInstall() {
-
-
- if [[ ! -z "$PYTHON_ENV" ]]; then
-
- local CHECK_PYCURL
- CHECK_PYCURL="$(python -c 'import pycurl; print(pycurl.version)' 2>&1 | grep PycURL)"
-
- if [[ -z "$CHECK_PYCURL" ]]; then
- debug "Making sure pycurl is installed" "info"
- #pip uninstall --yes pycurl
- export PYCURL_SSL_LIBRARY=${DEFAULT_SSL_LIBRARY}
- export LDFLAGS="-L${DEFAULT_SSL_PATH}/lib"
- export CPPFLAGS="-I${DEFAULT_SSL_PATH}/include"
-
- pip install --no-cache-dir --compile --ignore-installed --install-option="--with-openssl" pycurl
-# pip install pycurl
- local CHECK_PYCURL
- CHECK_PYCURL="$(python -c 'import pycurl; print(pycurl.version)' 2>&1)"
- if [[ "$CHECK_PYCURL" == *"Error"* ]]; then
- debug "PYCURL=$CHECK_PYCURL" "info"
- debug "PyCurl Not installed properly, aborting" "error"
- exit 1
- fi
- else
- debug "Pycurl is already installed" "info"
- fi
-
- local CHECK_ANSIBLE
- CHECK_ANSIBLE="$(which ansible 2>/dev/null)"
- if [[ -z "$CHECK_ANSIBLE" ]]; then
- debug "Making sure ansible is installed" "info"
- python -m pip install ansible paramiko PyYAML jinja2 httplib2 six docker-compose
- debug "ANSIBLE=$(ansible --version)" "info"
- else
- debug "Ansible is already installed" "info"
- fi
-
- debug "Installing dependencies for all projects" "info"
- if [ "$OS" == "windows" ]; then #can't use maven for dependencies install
- debug "Installing dependencies directly" "info"
- doProjectInstall "VM" "$DIR_ROOT/$PROJECT_VM"
- doProjectInstall "ESB" "$DIR_ROOT/$PROJECT_ESB"
- doProjectInstall "DEPLOY" "$DIR_ROOT/$PROJECT_DEPLOY"
- doProjectInstall "PROTOTYPE" "$DIR_ROOT/$PROJECT_PROTOTYPE"
- else
- debug "Installing dependencies using Maven" "info"
- mvn verify -Pdependencies -DskipTests=true --settings default.xml
- fi
- fi
-
-
-}
-
-function doQuickstart() {
-
- debug ">>> AUTOMATED QUICKSTART <<<