Skip to content

Feature/jenkinsfile updates #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bkaiserinfosec merged 19 commits into from
Mar 9, 2024
Merged

Feature/jenkinsfile updates #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1e79c8c
Update Jenkinsfile
bkaiserinfosec Jan 4, 2024
da05aed
added scores and grades api endpoint
bkaiserinfosec Jan 8, 2024
d5d2e52
Update Jenkinsfile
bkaiserinfosec Jan 8, 2024
e4a03cc
Merge branch 'release/0.2.0-beta/Test-1' into feature/Jenkinsfile-upd…
bkaiserinfosec Jan 8, 2024
1c686dc
Update Jenkinsfile
bkaiserinfosec Jan 8, 2024
a0b457d
Update pipeline-config.yaml
bkaiserinfosec Jan 8, 2024
2a883c7
Update pipeline-config.yaml
bkaiserinfosec Jan 8, 2024
aee46ec
Update pipeline-config.yaml
bkaiserinfosec Jan 8, 2024
339c255
Update Jenkinsfile
bkaiserinfosec Jan 8, 2024
96a1560
Update sgglobalthresholds.py
bkaiserinfosec Jan 10, 2024
607c8d0
Update initial_setup.py
bkaiserinfosec Jan 10, 2024
9fb5c66
add conditions for jenkins and snow integrations
bkaiserinfosec Jan 17, 2024
273ddde
add settings for Jenkins
bkaiserinfosec Feb 27, 2024
1280738
Update Jenkinsfile
bkaiserinfosec Feb 27, 2024
75db5d0
Update pipeline-config.yaml
bkaiserinfosec Feb 28, 2024
5f9eb28
Update Jenkinsfile
bkaiserinfosec Feb 28, 2024
8d6acec
Merge branch 'release/0.1.0-beta/Prod-azure' into feature/Jenkinsfile…
bkaiserinfosec Feb 28, 2024
7301c44
jenkins testing
bkaiserinfosec Feb 28, 2024
f75ce71
Update vulnerabilities.py
bkaiserinfosec Mar 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pipeline {
stage('Unit Testing') {
agent {
docker {
image 'securityuniversal/jenkins:latest'
image 'securityuniversal/jenkins-python-agent:latest'
}
}
when {
Expand All @@ -75,7 +75,7 @@ pipeline {
stage('Secret Scanning') {
agent {
docker {
image 'securityuniversal/jenkins-secret-agent:latest'
image 'securityuniversal/jenkins-sectesting-agent:latest'
}
}
when {
Expand All @@ -99,7 +99,7 @@ pipeline {
stage('Software Composition Analysis') {
agent {
docker {
image 'securityuniversal/jenkins:latest'
image 'securityuniversal/jenkins-sectesting-agent:latest'
}
}
when {
Expand Down Expand Up @@ -127,7 +127,7 @@ pipeline {
stage('Static Application Security Testing') {
agent {
docker {
image 'securityuniversal/jenkins:latest'
image 'securityuniversal/jenkins-sectesting-agent:latest'
}
}
when {
Expand Down Expand Up @@ -155,7 +155,7 @@ pipeline {
stage('Infrastructure-as-Code Security Testing') {
agent {
docker {
image 'securityuniversal/jenkins-iac-agent:latest'
image 'securityuniversal/jenkins-sectesting-agent:latest'
args '--group-add 999'
}
}
Expand Down Expand Up @@ -210,7 +210,7 @@ pipeline {
stage('Docker Container Scanning') {
agent {
docker {
image 'securityuniversal/jenkins-iac-agent:latest'
image 'securityuniversal/jenkins-sectesting-agent:latest'
args '--group-add 999'
}
}
Expand Down Expand Up @@ -294,6 +294,12 @@ pipeline {

////////// Quality Gate //////////
stage("Quality Gate - Security") {
agent {
docker {
image 'securityuniversal/jenkins-sectesting-agent:latest'
args '--group-add 999'
}
}
when {
expression {
def config = jslReadYamlConfig('securityQualityGate')
Expand Down
12 changes: 6 additions & 6 deletions pipeline-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ stages:
branches:
- release
unitTesting:
enabled: false
enabled: true
branches: []
secretScanning:
enabled: true
branches:
- release
sca:
enabled: false
enabled: true
branches:
- release
codeLanguages:
- Python
- Javascript
sast:
enabled: false
enabled: true
branches:
- release
codeLanguages:
Expand All @@ -37,19 +37,19 @@ stages:
branches:
- release
containerScan:
enabled: false
enabled: true
branches:
- release
containerName: secusphere
containerTag: latest
releaseToTest:
enabled: false
enabled: true
branches:
- release
serviceName: secusphere
containerTag: latest
testRelease:
enabled: false
enabled: true
branches:
- release
targetUrl: 'http://192.168.0.68:5010'
Expand Down
2 changes: 1 addition & 1 deletion src/vr/api/vulns/vulnerabilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def update_vulnerabilities_status(app_cmdb_id, scan_id, req_raw):
def add_vulns_background_process(req_raw):
now = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
app_name = req_raw['appName']
git_url = req_raw['giturl']
git_url = req_raw['gitUrl']
git_branch = req_raw['branch']
findings = req_raw['findings']
scan_type = req_raw['scanType']
Expand Down