Skip to content

Commit fdf5ae2

Browse files
ci: update to new pipeline (#142)
1 parent 8645cd9 commit fdf5ae2

File tree

5 files changed

+30
-51
lines changed

5 files changed

+30
-51
lines changed

.github/settings.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# any change of this settings.yml file is detected by the GitHub App and
66
# the settings of this repository are updated immediately.
77
#
8-
_extends: repo-settings:.github/common-settings.yml
8+
_extends: repo-settings:.github/common-settings-v2.yml
99

1010
# repo-specific settings
1111
#
@@ -20,3 +20,4 @@ repository:
2020
# organization page and in the 'About' section of the repository.
2121

2222
description: "Deploys the LogDNA agent and SysDig agents to a cluster"
23+
topics: core-team, terraform, ibm-cloud, terraform-module, logdna, sysdig, monitoring-agent, logging-agent, observability-agent

.github/workflows/ci.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
name: CI-Pipeline
22

3-
# Controls when the workflow will run
3+
# Controls when the workflow will run, when comment is created
44
on:
5-
# Triggers the workflow on push or pull request events but only for the main branch
6-
push:
7-
branches: [main]
8-
pull_request:
9-
branches: [main]
10-
11-
# Allows you to run this workflow manually from the Actions tab
12-
workflow_dispatch:
13-
5+
issue_comment:
6+
types:
7+
- created
148
jobs:
159
call-terraform-ci-pipeline:
16-
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci.yml@v1.9.1
10+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.14.0
1711
secrets: inherit
1812
with:
13+
craSCCv2: true
1914
craTarget: "examples/basic"
20-
craGoalIgnoreFile: "cra-tf-validate-ignore-goals.json"
15+
craRuleIgnoreFile: "cra-tf-validate-ignore-rules.json"

.github/workflows/release.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
name: Release-Pipeline
22

3+
# Trigger on push(merge) to main branch
34
on:
4-
workflow_run:
5-
workflows: [CI-Pipeline]
6-
branches: [main]
7-
types:
8-
- completed
9-
10-
# Allows you to run this workflow manually from the Actions tab
11-
workflow_dispatch:
5+
push:
6+
branches:
7+
- main
128

139
jobs:
1410
call-terraform-release-pipeline:
15-
if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
16-
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected]
11+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected]
1712
secrets: inherit

cra-tf-validate-ignore-goals.json

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

cra-tf-validate-ignore-rules.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"scc_rules": [
3+
{
4+
"scc_rule_id": "rule-216e2449-27d7-4afc-929a-b66e196a9cf9",
5+
"description": "Check whether Flow Logs for VPC are enabled",
6+
"ignore_reason": "This rule is not relevant to the module itself, just the VPC resource that is used in the example that is scanned",
7+
"is_valid": false
8+
},
9+
{
10+
"scc_rule_id": "rule-2325054a-c338-474a-9740-0b7034487e40",
11+
"description:": "Check whether OpenShift clusters are accessible only by using private endpoints",
12+
"ignore_reason": "This rule is not relevant to the module itself, just the cluster resource that is used in the example that is scanned",
13+
"is_valid": false
14+
}
15+
]
16+
}

0 commit comments

Comments
 (0)