Skip to content

Commit 484e844

Browse files
authored
Merge pull request #90 from cyberark/develop
Release v11.4
2 parents fa5c78a + 8e788f6 commit 484e844

File tree

5 files changed

+32
-35
lines changed

5 files changed

+32
-35
lines changed

.yamllint

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ rules:
5454
new-lines:
5555
type: unix
5656
trailing-spaces: enable
57-
truthy: disable
57+
truthy: disable

Jenkinsfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ pipeline {
55
}
66
}
77
environment {
8-
AWS_REGION = sh(script: 'curl -s http://169.254.169.254/latest/dynamic/instance-identity/document | python -c "import json,sys;obj=json.load(sys.stdin);print obj[\'region\']"', returnStdout: true).trim()
8+
AWS_REGION = sh(script: 'curl -s http://169.254.169.254/latest/dynamic/instance-identity/document | python3 -c "import json,sys;obj=json.load(sys.stdin);print (obj[\'region\'])"', returnStdout: true).trim()
99
shortCommit = sh(script: "git log -n 1 --pretty=format:'%h'", returnStdout: true).trim()
1010
}
1111
stages {
1212
stage('Install virtual environment') {
1313
steps {
1414
sh '''
15-
python -m pip install --user virtualenv
16-
python -m virtualenv .testenv
15+
python3 -m pip install --user virtualenv
16+
python3 -m virtualenv .testenv
1717
source .testenv/bin/activate
1818
pip install -r tests/requirements.txt
1919
'''

tests/default.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
- name: download package from s3
1212
aws_s3:
1313
bucket: cloud-initiatives-pipeline-bucket
14-
object: "Packages/v11.3/Privileged Session Manager-Rls-v11.3.zip"
14+
object: "Packages/v11.4/Privileged Session Manager-Rls-v11.4.zip"
1515
dest: "/tmp/psm.zip"
1616
mode: get
1717
delegate_to: localhost

tests/requirements.txt

+26-29
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,32 @@
1-
ansible==2.7.12
2-
ansible-lint==4.1.0
3-
asn1crypto==0.24.0
4-
bcrypt==3.1.6
1+
ansible==2.8.8
2+
ansible-lint==4.2.0
53
boto==2.49.0
6-
boto3==1.9.118
7-
botocore==1.12.118
8-
certifi==2019.3.9
9-
cffi==1.12.2
4+
boto3==1.12.8
5+
botocore==1.15.8
6+
certifi==2019.11.28
7+
cffi==1.14.0
108
chardet==3.0.4
11-
cryptography==2.6.1
12-
docutils==0.14
13-
idna==2.8
14-
Jinja2==2.10.1
15-
jmespath==0.9.4
9+
cryptography==2.8
10+
docutils==0.15.2
11+
idna==2.9
12+
Jinja2==2.11.1
13+
jmespath==0.9.5
1614
MarkupSafe==1.1.1
17-
ntlm-auth==1.2.0
18-
paramiko==2.4.2
19-
pathspec==0.5.9
20-
pyasn1==0.4.5
15+
ntlm-auth==1.4.0
16+
pathspec==0.7.0
17+
pyasn1==0.4.8
2118
pycparser==2.19
22-
PyNaCl==1.3.0
23-
pyOpenSSL==19.0.0
24-
python-dateutil==2.8.0
25-
pywinrm==0.3.0
26-
PyYAML==5.1
27-
requests==2.21.0
28-
requests-credssp==1.0.2
19+
pyOpenSSL==19.1.0
20+
python-dateutil==2.8.1
21+
pywinrm==0.4.1
22+
PyYAML==5.3
23+
requests==2.23.0
24+
requests-credssp==1.1.1
2925
requests-ntlm==1.1.0
30-
ruamel.yaml==0.15.89
31-
s3transfer==0.2.0
32-
six==1.12.0
33-
urllib3==1.25.2
26+
ruamel.yaml==0.16.10
27+
ruamel.yaml.clib==0.2.0
28+
s3transfer==0.3.3
29+
six==1.14.0
30+
urllib3==1.25.8
3431
xmltodict==0.12.0
35-
yamllint==1.15.0
32+
yamllint==1.20.0

vars/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
---
22
# vars file for psm
3-
psm_sha1_checksum: "4dc4bb0e296ef67479ce22564ea945c15ba3868b"
3+
psm_sha1_checksum: "8add8431764deb1901aca6c216d5adae25f79f93"

0 commit comments

Comments
 (0)