Merge branch 'develop' into MAAS_INTEGRATION

.github/workflows/build.yml

@@ -0,0 +1,119 @@
+name: "Yorc GH Actions Build"
+
+on: [push, pull_request]
+
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+
+  security:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Snyk to check for vulnerabilities
+      uses: snyk/actions/golang@master
+      continue-on-error: true # To make sure that SARIF upload gets called
+      env:
+        SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+      with:
+        args: --sarif-file-output=snyk.sarif
+    - name: Upload result to GitHub Code Scanning
+      uses: github/codeql-action/upload-sarif@v1
+      with:
+        sarif_file: snyk.sarif
+    - name: Run Snyk to check for vulnerabilities and send it to Snyk.io
+      uses: snyk/actions/golang@master
+      env:
+        SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+      with:
+        command: monitor
+
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        # Disabling shallow clone is recommended for improving relevancy of reporting (for sonar)
+        fetch-depth: 0
+    - name: Setup go
+      uses: actions/setup-go@v1
+      with:
+        go-version: "1"
+    - name: Test
+      run: |
+        go version
+        go env
+        echo "YORC_VERSION=$(grep "yorc_version" versions.yaml | awk '{print $2}')" >> $GITHUB_ENV
+        make tools
+        TESTARGS='-coverprofile coverage-sonar.out -coverpkg=./...' make json-test
+    - name: SonarCloud Scan
+      uses: sonarsource/sonarcloud-github-action@master
+      # Do this only on push commit do not need to be re-analyzed on PR
+      if: github.event_name == 'push'
+      with:
+        args: >
+          -Dsonar.projectVersion=${{ env.YORC_VERSION }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup jfrog CLI
+        uses: jfrog/setup-jfrog-cli@v1
+        env:
+          JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_SERVER_1 }}
+
+      - name: Ping Artifactory with jfrog CLI
+        run: |
+          # Ping the server
+          jfrog rt ping
+
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install sphinx dependencies
+        run: |
+          pip install --user --upgrade sphinx==1.8.1 semantic-version requests urllib3[secure]==1.23 Pygments>=2.7.1
+          pip install -r doc/requirements.txt
+          sudo apt-get install -y jq \
+                                  latexmk \
+                                  texlive-binaries \
+                                  texlive-fonts-recommended \
+                                  texlive-latex-base \
+                                  texlive-latex-extra \
+                                  texlive-latex-recommended
+
+      - name: Setup go
+        uses: actions/setup-go@v1
+        with:
+          go-version: "1"
+
+      - name: Make distribution
+        run: |
+          set -euo pipefail
+          make tools
+          SKIP_TESTS=1 make dist
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Make Docker container
+        run: |
+          ./docker_build.sh
+
+      - name: Deploy artifacts to Artifactory
+        run: |
+          ./build/deploy_artifactory.sh

.github/workflows/cleanup_artifactory.yml

@@ -0,0 +1,39 @@
+name: Artifactory Cleanup
+on:
+  workflow_dispatch:
+    inputs:
+      from_date:
+        description: ''
+        required: false
+        default: '30 days ago'
+  schedule:
+    - cron: '0 12 7,14,21,28 * *'
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  cleanup:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup jfrog CLI
+      uses: jfrog/setup-jfrog-cli@v1
+      env:
+        JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_SERVER_1 }}
+
+    - name: Ping Artifactory with jfrog CLI
+      run: |
+        # Ping the server
+        jfrog rt ping
+
+    - name: Run Cleanup
+      run: |
+        ./build/gh-action-cleanup-artifactory.sh
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        FROM_DATE: ${{ github.event.inputs.from_date || '30 days ago' }}

.github/workflows/release.yml

@@ -0,0 +1,110 @@
+name: Release
+on:
+  workflow_dispatch:
+    inputs:
+      release_version:
+        description: 'version to be released'
+        required: true
+        default: ''
+
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  release:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        # Disabling shallow clone to access git history (specially tags for comparing)
+        fetch-depth: 0
+        token: ${{ secrets.YSTIA_BOT_TOKEN }}
+    - name: Configure Git user
+      run: |
+        git config user.email "[email protected]"
+        git config user.name "@YstiaBot"
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+
+    - name: Install dependencies
+      run: pip install semantic_version
+
+    - name: Tag and push a release
+      id: release
+      run: |
+        ./build/release.sh -v "${{ github.event.inputs.release_version }}"
+        read -r major minor patch prerelease build <<< $(python -c "import semantic_version; v = semantic_version.Version('${{ github.event.inputs.release_version }}'); print(v.major, v.minor, v.patch, '.'.join(v.prerelease), '.'.join(v.build));")
+        if [[ -z "${prerelease}" ]] ; then
+            echo "PRERELEASE=false" >> $GITHUB_ENV
+        else
+            echo "PRERELEASE=true" >> $GITHUB_ENV
+        fi
+        tagName="v${{ github.event.inputs.release_version }}"
+        echo "TAG_NAME=${tagName}" >> $GITHUB_ENV
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Checkout tag
+      uses: actions/checkout@v2
+      with:
+        ref: ${{ env.TAG_NAME }}
+        token: ${{ secrets.YSTIA_BOT_TOKEN }}
+
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+
+    - name: Install sphinx dependencies
+      run: |
+        pip install --user --upgrade sphinx==1.8.1 semantic-version requests urllib3[secure]==1.23 Pygments>=2.7.1
+        pip install -r doc/requirements.txt
+        sudo apt-get install -y jq \
+                                latexmk \
+                                texlive-binaries \
+                                texlive-fonts-recommended \
+                                texlive-latex-base \
+                                texlive-latex-extra \
+                                texlive-latex-recommended
+
+    - name: Setup go
+      uses: actions/setup-go@v1
+      with:
+        go-version: "1"
+
+    - name: Generate distribution and changelog
+      run: |
+        set -euo pipefail
+        make tools
+        SKIP_TESTS=1 make dist
+        # Generate changelog
+        awk '{f=1} f{ if (/^## / && i++>=1) exit; else print $0}' CHANGELOG.md | tee CHANGELOG-for-version.md
+
+
+    - name: Create or Update Github Release draft
+      id: update_release
+      uses: loicalbertin/action-gh-release@080e2e752ac77817dcfd2e8809873bdc24817584
+      with:
+        tag_name: ${{ env.TAG_NAME }}
+        body_path: CHANGELOG-for-version.md
+        name: ${{ env.TAG_NAME }}
+        prerelease: ${{ env.PRERELEASE }}
+        draft: true
+        files: |
+          dist/yorc-*.tgz
+          dist/yorc-server*-distrib.zip
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Publish Github Release
+      uses: eregon/publish-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        release_id: ${{ steps.update_release.outputs.id }}

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 ## UNRELEASED
 
+### ENHANCEMENTS
+
+* Add the ability to define OpenStack Compute Instance user_data ([GH-735](https://github.com/ystia/yorc/issues/735))
+
+### BUG FIXES
+
+* Workflow with asynchronous action never stops after another step failure  ([GH-733](https://github.com/ystia/yorc/issues/733))
+
+## 4.2.0-milestone.1 (May 06, 2021)
+
+### ENHANCEMENTS
+
+* Support Alien4Cloud 3.2.0 ([GH-723](https://github.com/ystia/yorc/issues/723))
+
+### BUG FIXES
+
+* Can't bootstrap Yorc as BinTray is now unavailable ([GH-727](https://github.com/ystia/yorc/issues/727))
+
+## 4.1.0 (April 11, 2021)
+
 ### DEPENDENCIES
 
 * The orchestrator requires now at least Ansible 2.10.0 (upgrade from 2.7.9 introduced in [GH-648](https://github.com/ystia/yorc/issues/648))
@@ -20,6 +40,7 @@
 
 ### ENHANCEMENTS
 
+* Alllow shards and replicas configuration for Elastic storage ([GH-722](https://github.com/ystia/yorc/issues/722))
 * Add a new synchronous purge API endpoint ([GH-707](https://github.com/ystia/yorc/issues/707))
 * Should be able to specify the type of volume when creating an openstack instance ([GH-703](https://github.com/ystia/yorc/issues/703))
 * Support ssh connection retries ([GH-688](https://github.com/ystia/yorc/issues/688))