diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de1b43d921..fc0e23b69e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,11 +7,9 @@ stages: - generate - app_inspect - release - - publish_build_to_pre_qa include: - local: "pipeline/.validate.yml" - local: "pipeline/.generate.yml" - local: "pipeline/.app_inspect.yml" - - local: "pipeline/.release.yml" - - local: "pipeline/.publish_build_to_pre_qa.yml" \ No newline at end of file + - local: "pipeline/.release.yml" \ No newline at end of file diff --git a/contentctl.yml b/contentctl.yml index 7ac11bbd15..84048cc88c 100644 --- a/contentctl.yml +++ b/contentctl.yml @@ -3,7 +3,7 @@ build: path_root: dist prefix: ESCU build: 004150 - version: 4.15.0 + version: 4.14.1 label: ES Content Updates author_name: Splunk Threat Research Team author_email: research@splunk.com diff --git a/pipeline/.app_inspect.yml b/pipeline/.app_inspect.yml index d8e3ae8f8e..5c796aa342 100644 --- a/pipeline/.app_inspect.yml +++ b/pipeline/.app_inspect.yml @@ -11,7 +11,7 @@ app_inspect: - pip3 install poetry - git submodule update --init contentctl - cd contentctl - - git checkout fail_manual_check + - git checkout main - poetry install script: - poetry run contentctl -p ../ build --appinspect_api_username $APPINSPECT_USERNAME --appinspect_api_password $APPINSPECT_PASSWORD @@ -20,4 +20,4 @@ app_inspect: - cp -r dist/*.{json,html,log} artifacts/app_inspect_report rules: - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]$/' - when: always + when: on_success diff --git a/pipeline/.release.yml b/pipeline/.release.yml index 618a4e9252..e19a575831 100644 --- a/pipeline/.release.yml +++ b/pipeline/.release.yml @@ -20,7 +20,7 @@ reporting: - aws s3 cp reporting s3://$BUCKET/reporting --recursive --exclude "*" --include "*.svg" rules: - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]$/' - when: always + when: on_success # Security Content API Update security_content_api: @@ -58,7 +58,7 @@ security_content_api: - aws s3 cp dist/api s3://$BUCKET/json --recursive --exclude "*" --include "*.json" rules: - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]$/' - when: always + when: on_success # Update Attack Range ESCU App attack_range_escu_app: @@ -80,7 +80,7 @@ attack_range_escu_app: # - aws s3api put-object-acl --bucket $BUCKET --key DA-ESS-ContentUpdate-latest.tar.gz --acl public-read rules: - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]$/' - when: always + when: on_success # Sync change to GitHub develop github_push_develop: @@ -109,7 +109,7 @@ github_push_develop: - git push github_origin $BRANCH rules: - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]$/' - when: always + when: on_success # Create Package GitLab # need to be tested @@ -123,6 +123,6 @@ release_job: description: '$CI_COMMIT_TAG' rules: - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]$/' - when: always + when: on_success \ No newline at end of file