Merge branch 'master' into 'uj-hifis-overall'

# Conflicts:
#   _data/navigation.yml

.gitlab-ci.yml

@@ -28,12 +28,14 @@ stages:
 .common_production: &production_before_script
   before_script:
     - gem install bundler --no-document
-    - bundle install --jobs $(nproc) --without test "${FLAGS[@]}"
+    - bundle config set without 'test'
+    - bundle install --jobs $(nproc)
   <<: *cache_production
 
 .common_latest: &latest_before_script
   before_script:
     - "[[ -f \"Gemfile.lock\" ]] && rm Gemfile.lock"
+    - bundle config set without 'test'
     - bundle install --jobs $(nproc) --without test "${FLAGS[@]}"
     - bundle update --jobs $(nproc) "${FLAGS[@]}"
   <<: *cache_latest
@@ -74,9 +76,6 @@ stages:
   stage: test
   variables:
     <<: *common_variables
-    HTMLPROOFER_VERSION: 3.13.0
-    YAMLLINT_VERSION: 0.0.7
-    GIT_STRATEGY: none
   before_script:
     # Installing, generating and exporting locale because htmlproofer needs it.
     # Locale is not set in "standard" docker containers.
@@ -88,15 +87,15 @@ stages:
       export LANG=en_US.UTF-8 && \
       export LANGUAGE=en_US:en && \
       export LC_ALL=en_US.UTF-8"
-    - gem install html-proofer -v $HTMLPROOFER_VERSION --no-document
-    - gem install yaml-lint -v $YAMLLINT_VERSION --no-document
+    - gem install bundler --no-document
+    - bundle install --jobs $(nproc)
   script:
-    - "htmlproofer \
+    - "bundle exec htmlproofer \
         --internal-domains localhost:4000 \
         --disable-external \
         --assume-extension public/"
     # Use yaml-lint tool to check yaml files.
-    - "yaml-lint _data/ _config.yml"
+    - "bundle exec yaml-lint _data/ _config.yml"
   <<: *cache_production
   # https://docs.gitlab.com/ce/ci/yaml/#interruptible
   interruptible: true
@@ -159,8 +158,9 @@ test:htmlproofer:external_links:
     - build:production
   needs: ["build:production"]
   script:
-    - "htmlproofer \
+    - "bundle exec htmlproofer \
         --internal-domains localhost:4000 \
+        --url-ignore 'https://www.openstoragenetwork.org/'
         --assume-extension public/"
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'

Gemfile

@@ -2,14 +2,14 @@
 source 'https://rubygems.org'
 
 # List of required gems
-gem 'jekyll', '~> 4.1.1'
+gem 'jekyll', '~> 4.2.0'
 gem 'jekyll-paginate', '~> 1.1.0'
-gem 'rouge', '~> 3.25.0'
+gem 'rouge', '~> 3.26.0'
 gem 'jekyll-redirect-from', '~> 0.16.0'
 gem 'jekyll-feed', '~> 0.15.1'
 gem "jekyll-sitemap", "~> 1.4"
 
 group :test do
-    gem 'html-proofer', '~> 3.17.3'
+    gem 'html-proofer', '~> 3.18.5'
     gem 'yaml-lint', '~>0.0.7'
 end

Gemfile.lock

@@ -11,9 +11,9 @@ GEM
     ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
-    ffi (1.13.1)
+    ffi (1.14.2)
     forwardable-extended (2.6.0)
-    html-proofer (3.17.3)
+    html-proofer (3.18.5)
       addressable (~> 2.3)
       mercenary (~> 0.3)
       nokogumbo (~> 2.0)
@@ -24,21 +24,21 @@ GEM
     http_parser.rb (0.6.0)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jekyll (4.1.1)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
       mercenary (~> 0.4.0)
       pathutil (~> 0.9)
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
+      terminal-table (~> 2.0)
     jekyll-feed (0.15.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-paginate (1.1.0)
@@ -55,7 +55,7 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.2.1)
+    listen (3.3.3)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
@@ -73,11 +73,11 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.4)
-    rouge (3.25.0)
+    rouge (3.26.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
-    terminal-table (1.8.0)
+    terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
@@ -89,13 +89,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  html-proofer (~> 3.17.3)
-  jekyll (~> 4.1.1)
+  html-proofer (~> 3.18.5)
+  jekyll (~> 4.2.0)
   jekyll-feed (~> 0.15.1)
   jekyll-paginate (~> 1.1.0)
   jekyll-redirect-from (~> 0.16.0)
   jekyll-sitemap (~> 1.4)
-  rouge (~> 3.25.0)
+  rouge (~> 3.26.0)
   yaml-lint (~> 0.0.7)
 
 BUNDLED WITH

_data/hifis_team.yml

@@ -43,6 +43,7 @@
   cluster: overall
 - id: finke
   name: "Finke, Ants"
+  image: "Ants_Finke.jpg"
   location:
     campus: hzb
   position: "Coordinator"
@@ -82,6 +83,7 @@
   cluster: backbone
 - id: klotz
   name: "Klotz, Andreas"
+  image: "Andreas_Klotz.jpg"
   location:
     campus: hzb
   position: "Cloud Cluster Management"

_posts/2020/12/2020-12-17-eosc-general-assembly.md

+---
+title: "Constituting General Assembly of EOSC Association"
+title_image: spacex-uj3hvdfQujI-unsplash.jpg
+data: 2020-12-17
+authors:
+  - jandt
+layout: blogpost
+categories:
+  - news
+excerpt: >
+    In the constituting General Assembly of the EOSC association, the first President and Directors have been elected.
+
+---
+
+# EOSC Association General Assembly
+
+In the [constituting General Assembly](https://www.eosc-portal.eu/news/eosc-association-general-assembly-take-place-tomorrow) of the EOSC association, the first President and Directors have been elected.
+
+## President
+
+**Karel Luyben** (TU Delft) has been elected as president with 119 out of 139 votes.
+
+
+## Board of Directors
+
+The Board of Directors consists of the following eight members:
+
+#### For 3 year period
+
+- Marialuisa Lavitrano (UNIMIB), Italy
+- Suzanne Demouchel (CNRS), France
+- Klaus Tochtermann (ZBW), Germany
+
+#### For 2 year period
+
+- Sarah Jones (GÉANT)
+- Ignacio Blanquer (UPV), Spain
+
+#### For 1 year period
+
+- Wilhelm Widmark (SU), Sweden
+- Bob Jones (CERN)
+- Ronan Byrne (HEAnet), Ireland

_roadmap/cloud/2021-01-01.md

+---
+date: 2021-01-01
+title: Tasks in Jan 2021
+service: cloud
+---
+
+## Top 10 of future Helmholtz Cloud Services 
+We are happy to announce that the group of the 10 most mature services has reached a maturity level of more than 80% - more than sufficient for them to be integrated into the Cloud Portal in the coming weeks. This top group includes services like **GitLab** (HZDR, FZJ), **Nextcloud** (HZB, KIT), **Mattermost** (HZDR), **Rocket.Chat** (FZJ) but also **OpenStack** (FZJ, KIT), **JupyterHub** (FZJ), **Zammad** (HZDR) and **B2Share** (FZJ).
+
+Find more information of Initial Service Portfolio [here](https://hifis.net/news/2020/10/13/initial-service-portfolio.html).

_roadmap/cloud/2021-02-01.md

+---
+date: 2021-02-01
+title: Tasks in Feb 2021
+service: cloud
+---
+
+## Beta Version of Helmholtz Cloud Portal online
+The Helmholtz Cloud Portal allows harmonized access to all Helmholtz Cloud services. It contains all necessary information to access the available services. The alpha version of the portal is planned to be available by end 2020 and the publicly accessible beta version is planned for February 2021.
+
+
+

job_offers.md

@@ -8,7 +8,9 @@ excerpt:
 
 # Job Offers related to HIFIS
 {:.text-success}
-
+* DESY Hamburg:   
+  [**Scientist, to lead the implementation of a Helmholtz-wide Service Marketplace.**](https://www.desy.de/career/job_offers/index_eng.html?joboffer=93233)  
+  Application deadline: Jan 04, 2021. 
 
 # Further offers