Merge pull request opendevstack#6 from opendevstack/master

merge base project

.gitignore

@@ -2,3 +2,5 @@ _site
 .sass-cache
 build
 .gradle
+/.project
+.jekyll-metadata

_authors/clemens.utschig-utschig.md

@@ -1,18 +1,19 @@
 ---
 title: Clemens Utschig-Utschig
 username: clemens.utschig-utschig
-email: 
+email: [email protected]
 website: 
 picture: clemens.utschig-utschig.jpg
 social:
-  twitter: 
-  github: 
+  twitter: clemensutschig
+  github: clemensutschig
   stackoverflow: 
-  facebook: 
-  xing: 
+  facebook: n/a
+  xing: n/a 
 topics: 
 - ci/cd
-- devops and gile developemnt
+- devops and agile development
+- container everything
 ---
-**Clemens** works for Boehringer-Ingelheim’s IT organization – responsible for the global technology strategy, the architecture board and he is the CTO and head of engineering at BI X (bix-digital.com) – our digital startup incubator.
+**Clemens** works for Boehringer-Ingelheim’s IT organization – responsible for the global technology strategy, the architecture board and he is the CTO and head of engineering at BI X (bix-digital.com) - BI's digital startup incubator.
 

_events/devops-conf-2018-05-29.md

@@ -0,0 +1,21 @@
+---
+details:
+  date: 2018-05-28
+  time: 
+  logo:
+  logo_url: https://devopsconference.de/wp-content/uploads/2017/06/devopscon-logo-2.png
+name: DevOpsCon
+title: "Openshift and Jenkins / Stories of BI X"
+type: Presentation
+language: EN
+speaker: clemens.utschig-utschig
+location: 
+  city: Berlin
+  country: Germany
+  details: 
+  - Mercure Hotel MOA Berlin 
+material_url:
+
+---
+
+Stories of BI X - Openshift and Jenkins ... 

_includes/head-bootstrap.html

@@ -16,5 +16,6 @@
 
   <script src="{{ site.baseurl }}/assets/js/jquery-3.3.1.min.js"></script>
   <script src="{{ site.baseurl }}/assets/js/bootstrap.js"></script>
+  <script src="{{ site.baseurl }}/assets/js/mermaid.min.js"></script>
   {% feed_meta %}
 </head>

_includes/head.html

@@ -17,6 +17,7 @@
 <!-- Bootstrap
   <script src="{{ site.baseurl }}/assets/js/jquery-3.3.1.min.js"></script>
   <script src="{{ site.baseurl }}/assets/js/bootstrap.js"></script>
+  <script src="{{ site.baseurl }}/assets/js/mermaid.min.js"></script>
   -->
   {% feed_meta %}
 </head>

_includes/navbar-bootstrap-blog.html

@@ -6,10 +6,13 @@
       <div class="collapse navbar-collapse" id="navbarCollapse">
         <ul class="navbar-nav mr-auto">
           <li class="nav-item">
-            <a class="nav-link" href="{{ site.baseurl }}/doc/getting-started.html">Documentation</a>
+            <a class="nav-link" href="{{ site.baseurl }}/doc/getting-started.html">Installation Guide</a>
           </li>
           <li class="nav-item">
             <a class="nav-link" href="{{ site.baseurl }}/blog/index.html">Blog</a>
           </li>
+          <li class="nav-item">
+            <a class="nav-link" href="{{ site.baseurl }}/doc/overview.html">OpenDevstack Quickstart</a>
+          </li>              
       </div>
 </nav>

_includes/navbar-bootstrap-main.html

@@ -6,10 +6,13 @@
       <div class="collapse navbar-collapse" id="navbarCollapse">
         <ul class="navbar-nav mr-auto">
           <li class="nav-item">
-            <a class="nav-link" href="{{ site.baseurl }}/doc/getting-started.html">Documentation</a>
+            <a class="nav-link" href="{{ site.baseurl }}/doc/getting-started.html">Installation guide</a>
           </li>
           <li class="nav-item dropdown">
             <a class="nav-link" href="{{ site.baseurl }}/blog/index.html">Blog</a>
           </li>
+          <li class="nav-item">
+            <a class="nav-link" href="{{ site.baseurl }}/doc/overview.html">OpenDevstack Quickstart</a>
+          </li>              
       </div>
 </nav>

_includes/opendevstack-header.html

@@ -4,7 +4,7 @@ <h1 class="pt-1"><a href="/">OpenDevStack</a></h1>
     <h3 class="text-dark">provision.build.run</h3>
     <p>
       <div class="btn-group btn-group-lg pb-0" role="group">
-        <a href="{{site.baseurl}}/doc/getting-started" class="btn btn-primary">Getting started</a>
+        <a href="{{site.baseurl}}/doc/getting-started" class="btn btn-primary">Installation Guide</a>
         <a href="https://github.com/opendevstack" class="btn btn-primary">Visit our repository</a>
       </div>
     </p>

_layouts/documentation.html

@@ -5,7 +5,6 @@
 
     <body>
         {% include navbar-bootstrap-blog.html %}
-        {% include opendevstack-header.html %}
 
         <div class="container-fluid">
           <div class="row">

_layouts/index.html

@@ -9,7 +9,7 @@
             <div>
                 <h2><a href="/">OpenDevStack</a></h2>
                 <subheading >provision.build.run</subheading>
-                <div class="clearfix" id="header-btn"><div><a href="/doc/getting-started"> Getting started</a></div><div><a target="_blank" href="https://github.com/opendevstack">Visit our repository</a></div></div>
+                <div class="clearfix" id="header-btn"><div><a href="/doc/getting-started">Installation Guide</a></div><div><a target="_blank" href="https://github.com/opendevstack">Visit our repository</a></div></div>
             </div>
         </div>
         <div class="page-content">

_posts/2018-12-03-announcing-ods-version-1.md

@@ -0,0 +1,29 @@
+---
+title: "Announcement: Version 1.0 of OpenDevStack"
+topics:
+  - General
+author: clemens.utschig-utschig
+---
+With great pride - we are announcing version [1.0](https://github.com/orgs/opendevstack/projects/3) of the OpenDevStack.
+7+ months of work, > 500 commits, went into making the original version from [BI X](https://bix-digital.com) ready for the first major release.
+
+## Main Features:
+
+### [ODS Core](https://github.com/opendevstack/ods-core)
+1. Provide jenkins image(s) including owasp scan dependencies on top of the official Redhat ones (registry.access.redhat.com/openshift3/jenkins-*)
+1. Nexus and Sonarqube integrated setup running on OpenShift
+1. Provide webhook proxy, so we don't need to search for the right commit, branch, etc.
+
+### [ODS Jenkins Shared Library](https://github.com/opendevstack/ods-jenkins-shared-library)
+1. Provide consistent way of building, testing, deploying and scanning projects - radical simplification of building
+1. Auto creation of environment for a given branch if desired
+
+### [ODS Quickstarters](https://github.com/opendevstack/ods-project-quickstarters)
+1. As opposed to v.0.1 the generator images now inherit from the builder slaves, so we make sure what's generated - also works during build
+1. Slaves support HTTP proxy now, and bind themselves to the ODS Nexus for artifact mgmt
+
+### [ODS Provisioning App](https://github.com/opendevstack/ods-provisioning-app)
+1. Many (many) bugfixes went in, now full support for permission sets (rather than inheriting the global jira, confluence, bitbucket roles and rights)
+
+### [Tailor](https://github.com/opendevstack/tailor)
+1. CLI on top of the OC CLI - used thruout ODS for installation, patching etc. Allows for diff against current version, and single attribute / config patching

_posts/2018_12_03-announcing_ods-version_1.md

@@ -0,0 +1,29 @@
+---
+title: "Announcement: Version 1.0 of OpenDevStack"
+topics:
+  - General
+author: clemens.utschig-utschig
+---
+With great pride - we are announcing version [1.0](https://github.com/orgs/opendevstack/projects/3) of the OpenDevStack.
+7+ months of work, > 500 commits, went into making the original version from [BI X](https://bix-digital.com) ready for the first major release.
+
+## Main Features:
+
+### [ODS Core](https://github.com/opendevstack/ods-core)
+1. Provide jenkins image(s) including owasp scan dependencies on top of the official Redhat ones (registry.access.redhat.com/openshift3/jenkins-*)
+1. Nexus and Sonarqube integrated setup running on OpenShift
+1. Provide webhook proxy, so we don't need to search for the right commit, branch, etc.
+
+### [ODS Jenkins Shared Library](https://github.com/opendevstack/ods-jenkins-shared-library)
+1. Provide consistent way of building, testing, deploying and scanning projects - radical simplification of building
+1. Auto creation of environment for a given branch if desired
+
+### [ODS Quickstarters](https://github.com/opendevstack/ods-project-quickstarters)
+1. As opposed to v.0.1 the generator images now inherit from the builder slaves, so we make sure what's generated - also works during build
+1. Slaves support HTTP proxy now, and bind themselves to the ODS Nexus for artifact mgmt
+
+### [ODS Provisioning App](https://github.com/opendevstack/ods-provisioning-app)
+1. Many (many) bugfixes went in, now full support for permission sets (rather than inheriting the global jira, confluence, bitbucket roles and rights)
+
+### [Tailor](https://github.com/opendevstack/tailor)
+1. CLI on top of the OC CLI - used thruout ODS for installation, patching etc. Allows for diff against current version, and single attribute / config patching

_posts/2019-03-25-announcing-roadmap.md

@@ -0,0 +1,17 @@
+---
+title: "2019 roadmap and other ODS news"
+topics:
+  - General
+author: clemens.utschig-utschig
+---
+We have been pretty heads down for the last couple of months, in getting new stuff to fly for Version [1.1](https://github.com/orgs/opendevstack/projects/4), next to maintaing the [1.0.x train](https://github.com/orgs/opendevstack/projects/7).
+
+*Version 1.1* focuses on a few important topics:
+1. [Data Science & ML quickstarter](https://github.com/opendevstack/ods-project-quickstarters/tree/master/boilerplates/ds-ml-service)
+1. finally writing documentation (which we are pretty much done, at least for cut one :)) - there is now a README for each major component, and repo
+1. Adding some pretty useful features to [provision app](https://github.com/opendevstack/ods-provisioning-app) around project templates, and refactoring of the HTTP call mess we had with 0.1 / 1.0.x
+1. Providing a new release manager quickstarter to move an entire namespace & application into a new namespace - e.g. when you want to move from dev to test. (and automatically generate you documentation around your application)
+
+*Version 2.0* will focus on one big topic:
+1. Rework quickstarters and remove rundeck from the ODS mix, a lot of complexity will vanish and 
+morphe into std. Jenkins jobs.

_posts/2019-04-01-announcing-ods-version-1.0.2.md

@@ -0,0 +1,21 @@
+---
+title: "ODS 1.0.2 released"
+topics:
+  - Releases
+author: clemens.utschig-utschig
+---
+On the `1.0.x train` we officially released version [1.0.2](https://github.com/orgs/opendevstack/projects/7)) which contains a small set of painful bugs we discovered.
+
+## Main Fixes:
+
+### [ODS Core](https://github.com/opendevstack/ods-core/blob/v1.0.2/CHANGELOG.md)
+- failures due to dependency changes (e.g. for NGINX)
+
+### [ODS Jenkins Shared Library](https://github.com/opendevstack/ods-jenkins-shared-library/blob/v1.0.2/CHANGELOG.md)
+- addition of image labels for `author`, `commit`, `branch`, `builder` to allow for better bottom up tracebility, as we run a binary docker build
+
+### [ODS Quickstarters](https://github.com/opendevstack/ods-project-quickstarters/blob/v1.0.2/CHANGELOG.md)
+- failures due to dependency updates (e.g. for angular and spring boot) and python slave's PIP now allows for self signed certificates of `NEXUS`
+
+### [ODS Provisioning App](https://github.com/opendevstack/ods-provisioning-app/blob/v1.0.2/CHANGELOG.md)
+- suppport for people that rename `crowd sso cookie` to run multiple atlassian environments in the same subdomain, and several small rights/roles fixes.

authors.html

@@ -1,6 +1,6 @@
 ---
 layout: blog
-title: Autoren
+title: Authors
 permalink: /authors/
 ---
 <div class="container">

doc/development-guide.md

@@ -7,6 +7,9 @@ layout: documentation
 Learn all about how to make changes to OpenDevStack in your organisation and how
 to contribute those changes back upstream.
 
+This guides assumes you have followed the getting-started guide, and have cloned
+the ODS repositories to your local BitBucket instance.
+
 For the rest of this guide, we will use "ACME" as the organisation name, which
 you will need to replace appropriately.
 
@@ -32,17 +35,17 @@ branch like this:
 ```sh
 # Ensure you have the latest refs
 git fetch
-# Create a branch based on 1.0.x
-git checkout --no-track -b fix-typo origin/1.0.x
+# Create a branch based on 1.0.x - flag with bug / feature, e.g bug/fix-typo
+git checkout --no-track -b bug/fix-typo origin/1.0.x
 ```
 
 Once you have committed the desired changes, push your branch to BitBucket:
 ```sh
-git push origin fix-typo
+git push origin bug/fix-typo
 ```
 
 Afterwards, open a pull request. It is important that the target of the pull
-request is the `production` branch. That way, you do not pollute your base
+request is the `production` branch. That way, you do not pollute the ODS base
 branch (`1.0.x`) with changes. The `production` branch exists only in your
 BitBucket instance, and it is the branch that e.g. OpenShift points to, and
 consequently is the branch where all your changes should end up in.
@@ -54,9 +57,11 @@ well - continue with the next section if you want to do this.
 
 ## How to contribute changes upstream
 
-As your base branch is never polluted with local changes, every branch created
-from it is guaranteed to not contain any local changes, or changes to your
-OpenDevStack instance that you do not want to share publicly.
+Before you propose your code changes for merge, please open an issue describing
+what you are trying to do. Assign that issue to yourself and add labels as you see
+fit. However, leave the project field blank, as it is up to ODS maintainers to
+select in which project your issue will become available if your code changes are
+accepted.
 
 To contribute your work, first you need to have a space in GitHub where you have
 permissions to push your changes to. Typically, this is a fork of the repository
@@ -73,7 +78,7 @@ git remote add acme https://github.com/acme/<REPO_NAME>.git
 
 After that, you can push your changes there:
 ```sh
-git push acme fix-typo
+git push acme bug/fix-typo
 ```
 
 Once pushed, GitHub suggests to open a pull request, and automatically sets the
@@ -86,13 +91,40 @@ latest master originally, and your pull request shows a merge conflict, you
 need to cherry-pick (and adapt) your changes to a branch based on latest master
 in order to have it merged.
 
+Make sure that you link the pull request to the issue you opened earlier, either by
+pointing to it in your commit message(s) or by adding the link into the PR description.
+
 In general, to get your changes approved by core members of OpenDevStack, please
 ensure the following:
 
-* Before you make a bigger change, open a ticket first and discuss what you want
-  to do before you actually do it.
-* Explain why this change is necessary / benefitial.
+* You must open an issue first. The bigger the change, the better explain why this change
+  is necessary / benefitial.
 * Ensure to follow the guide above - branches containing unrelated commits or
   features targeting release branches etc. will not be approved.
-* Adhere to the relevant coding standard as set out in each repository.
+* Adhere to the relevant coding standard:
+    * Java files must be in [Google Java Style](https://google.github.io/styleguide/javaguide.html),
+      ensured by [google-java-format-1.6-all-deps.jar](https://github.com/google/google-java-format).
+    * Go files must be gofmt'd.
+    * Groovy files should follow the [Apache Groovy Style guide](http://groovy-lang.org/style-guide.html).
+* End all files with a newline character. See the POSIX definition of a
+  [line](http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap03.html#tag_03_205).
 * Add a changelog entry, linking to your pull request.
+
+## OpenDevStack branching flow for contributions
+
+Next sequence diagram provides a graphical understanding on the steps to follow in order to add a new functionality to the OpenDevStack official repository from ACME's private fork.
+The example is based on the assumption you want to contribute with a new feature from branch *1.0.x* or tag *v1.0.x*
+
+<div class="mermaid">
+sequenceDiagram
+    participant A as OpenDevStack <br />GitHub
+    participant B as ACME GitHub <br />OpenDevStack fork
+    participant C as ACME private repo <br />OpenDevStack fork
+    A->>C: 1.0.x/v1.0.1 checkout
+    C->>C: new feature branch X
+    Note right of C: develop and test
+    C-->>C: PR: branch X to production branch
+    Note right of C: test production
+    C->>B: push branch X
+    B-->>A: PR: branch X to 1.0.x/v1.0.1
+</div>

doc/getting-started.md

@@ -675,6 +675,8 @@ After this step you will have to create the following repositories in the **Repo
 | sbt-releases | maven2 | proxy  | checked | Release        | permissive | default  | unchecked                 | Disable-redeploy  | https://repo.scala-sbt.org/scalasbt/sbt-plugin-releases | ivy-releases
 | typesafe-ivy-releases | maven2 | proxy  | checked | Release        | permissive | default  | unchecked                 | Disable-redeploy  | https://dl.bintray.com/typesafe/ivy-releases | ivy-releases
 | ivy-releases | maven2 | group  | checked | Release        | permissive | default  | unchecked                 | Disable-redeploy  | |
+| pypi-all | pypi | group  | checked |         |  | default  |                 | |  | pypi-proxy |  
+| pypi-proxy | pypi | proxy  | checked |         |  | default  |                |  | https://pypi.org/ | |
 
 
 ##### Configure user and roles