Merge pull request #2916 from splunk/gitlab_release_v4.16.0

Gitlab release v4.16.0

.github/workflows/validate-and-build.yml

@@ -0,0 +1,54 @@
+name: validate-and-build
+on:
+  push:
+  pull_request:
+    types: [opened, reopened]
+jobs:
+
+  validate-and-build:
+    #Note that the CircleCI job used a Container.  The way to do this with Github Actions
+    #is to first start up a Virtual Machine, then we can by following:
+    # https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repository code
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.9' #Available versions here - https://github.com/actions/python-versions/releases  easy to change/make a matrix/use pypy
+          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
+
+      - name: Install System Packages
+        run: |
+          sudo apt update -qq
+          sudo apt install jq -qq
+      
+
+      - name: Install Python Dependencies and ContentCTL
+        run: |
+          pip3 install poetry
+          git submodule update --init contentctl
+          cd contentctl
+          git checkout main
+          poetry install
+      
+      - name: content_ctl validate
+        run: |
+          cd contentctl
+          poetry run contentctl -p ../ validate 
+
+      - name: contentctl generate
+        run: |
+          cd contentctl
+          poetry run contentctl -p ../ build
+          cd ..
+          mkdir artifacts
+          mv dist/DA-ESS-ContentUpdate-latest.tar.gz artifacts/
+
+      - name: store_artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: content-latest
+          path: |
+            artifacts/DA-ESS-ContentUpdate-latest.tar.gz

.gitlab-ci.yml

@@ -1,20 +1,29 @@
 default:
   image: docker-hub.repo.splunkdev.net/python:3.9
 
+variables:
+  SKIP_DOWNSTREAM_TESTING:
+    value: "False"
+    description: "If true, downstream testing will be suppressed (useful for debugging or forcing a release in an emergency)."
+
 stages:
   - validate
   - generate
   - app_inspect
+  - test
   - release
 
 include:
   - local: "pipeline/.validate.yml"
   - local: "pipeline/.generate.yml"
+  - local: "pipeline/.test.yml"
   - local: "pipeline/.app_inspect.yml"
   - local: "pipeline/.release.yml"
+  - local: "pipeline/.post.yml"
 
 workflow:
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH =~ /^release_v[0-9]+\.[0-9]+\.[0-9]+$/

contentctl.py

@@ -1,3 +1,8 @@
+#### DEPRECATED
+
+### This code is deprecated : use the submodule contentctl and these functionalities are available with that application
+###
+
 import sys
 import argparse
 import os 

contentctl.yml

@@ -5,8 +5,8 @@ build:
   name: DA-ESS-ContentUpdate
   path_root: dist
   prefix: ESCU
-  build: 004150
-  version: 4.15.0
+  build: 004160
+  version: 4.16.0
   label: ES Content Updates
   author_name: Splunk Threat Research Team
   author_email: research@splunk.com