Skip to content

Commit

Permalink
Merge pull request #90 from cyberark/develop
Browse files Browse the repository at this point in the history
Release v11.4
  • Loading branch information
erz4 authored Apr 7, 2020
2 parents fa5c78a + 8e788f6 commit 484e844
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ rules:
new-lines:
type: unix
trailing-spaces: enable
truthy: disable
truthy: disable
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ pipeline {
}
}
environment {
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()
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()
shortCommit = sh(script: "git log -n 1 --pretty=format:'%h'", returnStdout: true).trim()
}
stages {
stage('Install virtual environment') {
steps {
sh '''
python -m pip install --user virtualenv
python -m virtualenv .testenv
python3 -m pip install --user virtualenv
python3 -m virtualenv .testenv
source .testenv/bin/activate
pip install -r tests/requirements.txt
'''
Expand Down
2 changes: 1 addition & 1 deletion tests/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- name: download package from s3
aws_s3:
bucket: cloud-initiatives-pipeline-bucket
object: "Packages/v11.3/Privileged Session Manager-Rls-v11.3.zip"
object: "Packages/v11.4/Privileged Session Manager-Rls-v11.4.zip"
dest: "/tmp/psm.zip"
mode: get
delegate_to: localhost
Expand Down
55 changes: 26 additions & 29 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,35 +1,32 @@
ansible==2.7.12
ansible-lint==4.1.0
asn1crypto==0.24.0
bcrypt==3.1.6
ansible==2.8.8
ansible-lint==4.2.0
boto==2.49.0
boto3==1.9.118
botocore==1.12.118
certifi==2019.3.9
cffi==1.12.2
boto3==1.12.8
botocore==1.15.8
certifi==2019.11.28
cffi==1.14.0
chardet==3.0.4
cryptography==2.6.1
docutils==0.14
idna==2.8
Jinja2==2.10.1
jmespath==0.9.4
cryptography==2.8
docutils==0.15.2
idna==2.9
Jinja2==2.11.1
jmespath==0.9.5
MarkupSafe==1.1.1
ntlm-auth==1.2.0
paramiko==2.4.2
pathspec==0.5.9
pyasn1==0.4.5
ntlm-auth==1.4.0
pathspec==0.7.0
pyasn1==0.4.8
pycparser==2.19
PyNaCl==1.3.0
pyOpenSSL==19.0.0
python-dateutil==2.8.0
pywinrm==0.3.0
PyYAML==5.1
requests==2.21.0
requests-credssp==1.0.2
pyOpenSSL==19.1.0
python-dateutil==2.8.1
pywinrm==0.4.1
PyYAML==5.3
requests==2.23.0
requests-credssp==1.1.1
requests-ntlm==1.1.0
ruamel.yaml==0.15.89
s3transfer==0.2.0
six==1.12.0
urllib3==1.25.2
ruamel.yaml==0.16.10
ruamel.yaml.clib==0.2.0
s3transfer==0.3.3
six==1.14.0
urllib3==1.25.8
xmltodict==0.12.0
yamllint==1.15.0
yamllint==1.20.0
2 changes: 1 addition & 1 deletion vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
# vars file for psm
psm_sha1_checksum: "4dc4bb0e296ef67479ce22564ea945c15ba3868b"
psm_sha1_checksum: "8add8431764deb1901aca6c216d5adae25f79f93"

0 comments on commit 484e844

Please sign in to comment.