Skip to content

Commit 429a7ba

Browse files
authored
Merge pull request #2916 from splunk/gitlab_release_v4.16.0
Gitlab release v4.16.0
2 parents dfd7454 + 1f16d12 commit 429a7ba

File tree

197 files changed

+3934
-1527
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+3934
-1527
lines changed

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

Lines changed: 0 additions & 509 deletions
This file was deleted.

.github/workflows/detection-smoketesting.yml

Lines changed: 0 additions & 48 deletions
This file was deleted.

.github/workflows/detection-testing.yml

Lines changed: 294 additions & 294 deletions
Large diffs are not rendered by default.
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: validate-and-build
2+
on:
3+
push:
4+
pull_request:
5+
types: [opened, reopened]
6+
jobs:
7+
8+
validate-and-build:
9+
#Note that the CircleCI job used a Container. The way to do this with Github Actions
10+
#is to first start up a Virtual Machine, then we can by following:
11+
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check out the repository code
15+
uses: actions/checkout@v3
16+
17+
- uses: actions/setup-python@v4
18+
with:
19+
python-version: '3.9' #Available versions here - https://github.com/actions/python-versions/releases easy to change/make a matrix/use pypy
20+
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
21+
22+
- name: Install System Packages
23+
run: |
24+
sudo apt update -qq
25+
sudo apt install jq -qq
26+
27+
28+
- name: Install Python Dependencies and ContentCTL
29+
run: |
30+
pip3 install poetry
31+
git submodule update --init contentctl
32+
cd contentctl
33+
git checkout main
34+
poetry install
35+
36+
- name: content_ctl validate
37+
run: |
38+
cd contentctl
39+
poetry run contentctl -p ../ validate
40+
41+
- name: contentctl generate
42+
run: |
43+
cd contentctl
44+
poetry run contentctl -p ../ build
45+
cd ..
46+
mkdir artifacts
47+
mv dist/DA-ESS-ContentUpdate-latest.tar.gz artifacts/
48+
49+
- name: store_artifacts
50+
uses: actions/upload-artifact@v3
51+
with:
52+
name: content-latest
53+
path: |
54+
artifacts/DA-ESS-ContentUpdate-latest.tar.gz

.gitlab-ci.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
11
default:
22
image: docker-hub.repo.splunkdev.net/python:3.9
33

4+
variables:
5+
SKIP_DOWNSTREAM_TESTING:
6+
value: "False"
7+
description: "If true, downstream testing will be suppressed (useful for debugging or forcing a release in an emergency)."
8+
49
stages:
510
- validate
611
- generate
712
- app_inspect
13+
- test
814
- release
915

1016
include:
1117
- local: "pipeline/.validate.yml"
1218
- local: "pipeline/.generate.yml"
19+
- local: "pipeline/.test.yml"
1320
- local: "pipeline/.app_inspect.yml"
1421
- local: "pipeline/.release.yml"
22+
- local: "pipeline/.post.yml"
1523

1624
workflow:
1725
rules:
1826
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
1927
- if: $CI_COMMIT_TAG
20-
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
28+
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
29+
- if: $CI_COMMIT_BRANCH =~ /^release_v[0-9]+\.[0-9]+\.[0-9]+$/

contentctl.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#### DEPRECATED
2+
3+
### This code is deprecated : use the submodule contentctl and these functionalities are available with that application
4+
###
5+
16
import sys
27
import argparse
38
import os

contentctl.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ build:
55
name: DA-ESS-ContentUpdate
66
path_root: dist
77
prefix: ESCU
8-
build: 004150
9-
version: 4.15.0
8+
build: 004160
9+
version: 4.16.0
1010
label: ES Content Updates
1111
author_name: Splunk Threat Research Team
1212
author_email: [email protected]

0 commit comments

Comments
 (0)