conjur-api 6.0.1.pre.250 → 6.0.1.pre.382

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/Jenkinsfile +15 -12
  4. data/VERSION +1 -1
  5. data/ci/configure.sh +2 -0
  6. data/docker-compose.yml +1 -2
  7. data/test.sh +5 -2
  8. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 87a442076a86568ddabff5afd5b9cd8b437c9e8c494290e47256f4a18742a620
4
- data.tar.gz: 9e93f94e7e55dcf0df83741f79184d037ebdacac5d77ac548635fcac82299f1a
3
+ metadata.gz: b38490b8b1cc1d961f44a3606ab5f82dff2d12c307e62283e85ead370026879f
4
+ data.tar.gz: 98736a2ec14a930a32d98c292603e764cde17bcec34f08370839edb1d3bec874
5
5
  SHA512:
6
- metadata.gz: 9a57f7864acdb019e5310b31df1201975b67cd08ed7fc7ae5c2cdf603762d69abacaa537ef74bde6abd6759cf03947ebfc5e880003c5aeeee855c0936bddc4aa
7
- data.tar.gz: 58d614f50cf4102b32e8e5f86899e48a36f67bf326b7f0525c1b9442b44eb65479f59d31225e361a47e78f990c7f27d111667b7679c7d30022ec3f13ba403fcb
6
+ metadata.gz: 9e4875ecf302c6b7f9f7cd871ff822360ff811af1b8c468417f5a31a8cd6aa33a15750c615c1723fd82544face90cf25e7d7e98ee0c7f3ce99153cea95f711ce
7
+ data.tar.gz: f5828a06ae4bf3d073da67a08b31cadbde1b5e02422226237c0382477c0bc8135e82aa9cb2f59b5ce186cce3b55e6a29eaa34a78ebf5d313c7a730081ba6329f
data/Gemfile CHANGED
@@ -1,6 +1,6 @@
1
1
  source 'https://rubygems.org'
2
2
 
3
- #ruby=ruby-3.0
3
+ #ruby=ruby-3.2
4
4
  #ruby-gemset=conjur-api
5
5
 
6
6
  # Specify your gem's dependencies in conjur-api.gemspec
data/Jenkinsfile CHANGED
@@ -79,53 +79,56 @@ pipeline {
79
79
  }
80
80
  }
81
81
 
82
- stage('Test Ruby 3.0') {
82
+ stage('Test Ruby 3.2') {
83
83
  environment {
84
- RUBY_VERSION = '3.0'
84
+ INFRAPOOL_RUBY_VERSION = '3.2'
85
+ INFRAPOOL_REGISTRY_URL = "registry.tld"
85
86
  }
86
87
  steps {
87
88
  script {
88
89
  infrapool.agentSh "./test.sh"
89
- infrapool.agentStash name: 'reports3.0', includes: '**/reports/*.xml'
90
+ infrapool.agentStash name: 'reports3.2', includes: '**/reports/*.xml'
90
91
  }
91
92
  }
92
93
  post {
93
94
  always {
94
- unstash 'reports3.0'
95
+ unstash 'reports3.2'
95
96
  }
96
97
  }
97
98
  }
98
99
 
99
- stage('Test Ruby 3.1') {
100
+ stage('Test Ruby 3.3') {
100
101
  environment {
101
- RUBY_VERSION = '3.1'
102
+ INFRAPOOL_RUBY_VERSION = '3.3'
103
+ INFRAPOOL_REGISTRY_URL = "registry.tld"
102
104
  }
103
105
  steps {
104
106
  script {
105
107
  infrapool.agentSh "./test.sh"
106
- infrapool.agentStash name: 'reports3.1', includes: '**/reports/*.xml'
108
+ infrapool.agentStash name: 'reports3.3', includes: '**/reports/*.xml'
107
109
  }
108
110
  }
109
111
  post {
110
112
  always {
111
- unstash 'reports3.1'
113
+ unstash 'reports3.3'
112
114
  }
113
115
  }
114
116
  }
115
117
 
116
- stage('Test Ruby 3.2') {
118
+ stage('Test Ruby 3.4') {
117
119
  environment {
118
- RUBY_VERSION = '3.2'
120
+ INFRAPOOL_RUBY_VERSION = '3.4'
121
+ INFRAPOOL_REGISTRY_URL = "registry.tld"
119
122
  }
120
123
  steps {
121
124
  script {
122
125
  infrapool.agentSh "./test.sh"
123
- infrapool.agentStash name: 'reports3.2', includes: '**/reports/*.xml'
126
+ infrapool.agentStash name: 'reports3.4', includes: '**/reports/*.xml'
124
127
  }
125
128
  }
126
129
  post {
127
130
  always {
128
- unstash 'reports3.2'
131
+ unstash 'reports3.4'
129
132
  }
130
133
  }
131
134
  }
data/VERSION CHANGED
@@ -1 +1 @@
1
- 6.0.1-250
1
+ 6.0.1-382
data/ci/configure.sh CHANGED
@@ -15,5 +15,7 @@ done
15
15
  curl -o /dev/null -fs -X OPTIONS http://localhost > /dev/null
16
16
  CONFIGURE
17
17
 
18
+ wait_for_keycloak_server
19
+
18
20
  fetch_keycloak_certificate
19
21
  create_keycloak_users
data/docker-compose.yml CHANGED
@@ -1,4 +1,3 @@
1
- version: '2.1'
2
1
  services:
3
2
  pg:
4
3
  image: postgres:15
@@ -6,7 +5,7 @@ services:
6
5
  POSTGRES_HOST_AUTH_METHOD: trust
7
6
 
8
7
  conjur:
9
- image: cyberark/conjur:edge
8
+ image: ${REGISTRY_URL:-docker.io}/cyberark/conjur:edge
10
9
  # TODO: Test with a version that supports authn-sut
11
10
  command: server -a cucumber
12
11
  environment:
data/test.sh CHANGED
@@ -1,9 +1,12 @@
1
1
  #!/bin/bash -e
2
2
 
3
- : "${RUBY_VERSION=3.0}"
3
+ : "${RUBY_VERSION=3.2}"
4
4
  # My local RUBY_VERSION is set to ruby-#.#.# so this allows running locally.
5
5
  RUBY_VERSION="$(cut -d '-' -f 2 <<< "$RUBY_VERSION")"
6
6
 
7
+ export REGISTRY_URL=${INFRAPOOL_REGISTRY_URL:-"docker.io"}
8
+ export RUBY_VERSION="${INFRAPOOL_RUBY_VERSION:-$RUBY_VERSION}"
9
+
7
10
  source ./ci/oauth/keycloak/keycloak_functions.sh
8
11
  TOP_LEVEL=$(git rev-parse --show-toplevel)
9
12
 
@@ -49,7 +52,7 @@ function runTests() {
49
52
  echo 'Waiting for Conjur to come up, and configuring it...'
50
53
  ./ci/configure.sh
51
54
 
52
- local api_key=$(docker compose exec -T conjur rake 'role:retrieve-key[cucumber:user:admin]')
55
+ local api_key=$(docker compose exec -T conjur bundle exec rake 'role:retrieve-key[cucumber:user:admin]')
53
56
 
54
57
  echo 'Running tests'
55
58
  echo '-----'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conjur-api
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.1.pre.250
4
+ version: 6.0.1.pre.382
5
5
  platform: ruby
6
6
  authors:
7
7
  - CyberArk Maintainers
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-09-12 00:00:00.000000000 Z
11
+ date: 2025-03-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rest-client
@@ -424,7 +424,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
424
424
  - !ruby/object:Gem::Version
425
425
  version: 1.3.1
426
426
  requirements: []
427
- rubygems_version: 3.4.10
427
+ rubygems_version: 3.4.19
428
428
  signing_key:
429
429
  specification_version: 4
430
430
  summary: Conjur API