Skip to content

Commit fb8730f

Browse files
committed
Disable Ruby 2.7-3.3 for multicontainer
This is a mitigation for crossing the 1h timeout. These versions should be extracted to single container cases, while multicontainer should test an actually interesting multicontainer. Meanwhile, we keep the min and max, as well as the commented out bits and dead Dockerfiles for them to be moved sooner rather than later.
1 parent 72b79a7 commit fb8730f

File tree

6 files changed

+0
-215
lines changed

6 files changed

+0
-215
lines changed

utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multialpine.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,6 @@ weblog:
1212
local_path: lib-injection/build/docker/ruby
1313
- name: copy-ruby3_4-app-dockerfile
1414
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine
15-
- name: copy-ruby3_3-app-dockerfile
16-
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_3-alpine
17-
- name: copy-ruby3_2-app-dockerfile
18-
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_2-alpine
19-
- name: copy-ruby3_1-app-dockerfile
20-
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_1-alpine
21-
- name: copy-ruby3_0-app-dockerfile
22-
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_0-alpine
23-
- name: copy-ruby2_7-app-dockerfile
24-
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_2_7-alpine
2515
- name: copy-ruby2_6-app-dockerfile
2616
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_2_6-alpine
2717
- name: copy-reverseproxy-dockerfile

utils/build/virtual_machine/weblogs/ruby/provision_test-app-ruby-multicontainer.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,6 @@ weblog:
1212
local_path: lib-injection/build/docker/ruby
1313
- name: copy-ruby3_4-app-dockerfile
1414
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4
15-
- name: copy-ruby3_3-app-dockerfile
16-
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3
17-
- name: copy-ruby3_2-app-dockerfile
18-
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_2
19-
- name: copy-ruby3_1-app-dockerfile
20-
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_1
21-
- name: copy-ruby3_0-app-dockerfile
22-
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_0
23-
- name: copy-ruby2_7-app-dockerfile
24-
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_7
2515
- name: copy-ruby2_6-app-dockerfile
2616
local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_6
2717
- name: copy-reverseproxy-dockerfile

utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/docker-compose.yml

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -22,56 +22,6 @@ services:
2222
healthcheck:
2323
test: "curl -f http://localhost:18080"
2424

25-
ruby_3_3:
26-
env_file: "scenario_app.env"
27-
image: system-tests/ruby_3_3:latest
28-
restart: always
29-
build:
30-
context: .
31-
dockerfile: Dockerfile.ruby_3_3-alpine
32-
healthcheck:
33-
test: "curl -f http://localhost:18080"
34-
35-
ruby_3_2:
36-
env_file: "scenario_app.env"
37-
image: system-tests/ruby_3_2:latest
38-
restart: always
39-
build:
40-
context: .
41-
dockerfile: Dockerfile.ruby_3_2-alpine
42-
healthcheck:
43-
test: "curl -f http://localhost:18080"
44-
45-
ruby_3_1:
46-
env_file: "scenario_app.env"
47-
image: system-tests/ruby_3_1:latest
48-
restart: always
49-
build:
50-
context: .
51-
dockerfile: Dockerfile.ruby_3_1-alpine
52-
healthcheck:
53-
test: "curl -f http://localhost:18080"
54-
55-
ruby_3_0:
56-
env_file: "scenario_app.env"
57-
image: system-tests/ruby_3_0:latest
58-
restart: always
59-
build:
60-
context: .
61-
dockerfile: Dockerfile.ruby_3_0-alpine
62-
healthcheck:
63-
test: "curl -f http://localhost:18080"
64-
65-
ruby_2_7:
66-
env_file: "scenario_app.env"
67-
image: system-tests/ruby_2_7:latest
68-
restart: always
69-
build:
70-
context: .
71-
dockerfile: Dockerfile.ruby_2_7-alpine
72-
healthcheck:
73-
test: "curl -f http://localhost:18080"
74-
7525
ruby_2_6:
7626
env_file: "scenario_app.env"
7727
image: system-tests/ruby_2_6:latest

utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/nginx.conf

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,6 @@ http {
4242
'runtime':'3.4',
4343
'type':'alpine',
4444
'url':'/ruby_3_4/'
45-
},{
46-
'runtime':'3.3',
47-
'type':'alpine',
48-
'url':'/ruby_3_3/'
49-
},{
50-
'runtime':'3.2',
51-
'type':'alpine',
52-
'url':'/ruby_3_2/'
53-
},{
54-
'runtime':'3.1',
55-
'type':'alpine',
56-
'url':'/ruby_3_1/'
57-
},{
58-
'runtime':'3.0',
59-
'type':'alpine',
60-
'url':'/ruby_3_0/'
61-
},{
62-
'runtime':'2.7',
63-
'type':'alpine',
64-
'url':'/ruby_2_7/'
6545
},{
6646
'runtime':'2.6',
6747
'type':'alpine',
@@ -76,26 +56,6 @@ http {
7656
proxy_pass http://ruby_3_4_app/;
7757
proxy_redirect off;
7858
}
79-
location /ruby_3_3/ {
80-
proxy_pass http://ruby_3_3_app/;
81-
proxy_redirect off;
82-
}
83-
location /ruby_3_2/ {
84-
proxy_pass http://ruby_3_2_app/;
85-
proxy_redirect off;
86-
}
87-
location /ruby_3_1/ {
88-
proxy_pass http://ruby_3_1_app/;
89-
proxy_redirect off;
90-
}
91-
location /ruby_3_0/ {
92-
proxy_pass http://ruby_3_0_app/;
93-
proxy_redirect off;
94-
}
95-
location /ruby_2_7/ {
96-
proxy_pass http://ruby_2_7_app/;
97-
proxy_redirect off;
98-
}
9959
location /ruby_2_6/ {
10060
proxy_pass http://ruby_2_6_app/;
10161
proxy_redirect off;

utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/docker-compose.yml

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -22,56 +22,6 @@ services:
2222
healthcheck:
2323
test: "curl -f http://localhost:18080/"
2424

25-
ruby_3_3:
26-
env_file: "scenario_app.env"
27-
image: system-tests/ruby_3_3:latest
28-
restart: always
29-
build:
30-
context: .
31-
dockerfile: Dockerfile.ruby_3_3
32-
healthcheck:
33-
test: "curl -f http://localhost:18080/"
34-
35-
ruby_3_2:
36-
env_file: "scenario_app.env"
37-
image: system-tests/ruby_3_2:latest
38-
restart: always
39-
build:
40-
context: .
41-
dockerfile: Dockerfile.ruby_3_2
42-
healthcheck:
43-
test: "curl -f http://localhost:18080/"
44-
45-
ruby_3_1:
46-
env_file: "scenario_app.env"
47-
image: system-tests/ruby_3_1:latest
48-
restart: always
49-
build:
50-
context: .
51-
dockerfile: Dockerfile.ruby_3_1
52-
healthcheck:
53-
test: "curl -f http://localhost:18080/"
54-
55-
ruby_3_0:
56-
env_file: "scenario_app.env"
57-
image: system-tests/ruby_3_0:latest
58-
restart: always
59-
build:
60-
context: .
61-
dockerfile: Dockerfile.ruby_3_0
62-
healthcheck:
63-
test: "curl -f http://localhost:18080/"
64-
65-
ruby_2_7:
66-
env_file: "scenario_app.env"
67-
image: system-tests/ruby_2_7:latest
68-
restart: always
69-
build:
70-
context: .
71-
dockerfile: Dockerfile.ruby_2_7
72-
healthcheck:
73-
test: "curl -f http://localhost:18080/"
74-
7525
ruby_2_6:
7626
env_file: "scenario_app.env"
7727
image: system-tests/ruby_2_6:latest

utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/nginx.conf

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,6 @@ http {
1212
upstream ruby_3_4_app {
1313
server ruby_3_4:18080;
1414
}
15-
upstream ruby_3_3_app {
16-
server ruby_3_3:18080;
17-
}
18-
upstream ruby_3_2_app {
19-
server ruby_3_2:18080;
20-
}
21-
upstream ruby_3_1_app {
22-
server ruby_3_1:18080;
23-
}
24-
upstream ruby_3_0_app {
25-
server ruby_3_0:18080;
26-
}
27-
upstream ruby_2_7_app {
28-
server ruby_2_7:18080;
29-
}
3015
upstream ruby_2_6_app {
3116
server ruby_2_6:18080;
3217
}
@@ -42,26 +27,6 @@ http {
4227
'runtime':'3.4',
4328
'type':'container',
4429
'url':'/ruby_3_4/'
45-
},{
46-
'runtime':'3.3',
47-
'type':'container',
48-
'url':'/ruby_3_3/'
49-
},{
50-
'runtime':'3.2',
51-
'type':'container',
52-
'url':'/ruby_3_2/'
53-
},{
54-
'runtime':'3.1',
55-
'type':'container',
56-
'url':'/ruby_3_1/'
57-
},{
58-
'runtime':'3.0',
59-
'type':'container',
60-
'url':'/ruby_3_0/'
61-
},{
62-
'runtime':'2.7',
63-
'type':'container',
64-
'url':'/ruby_2_7/'
6530
},{
6631
'runtime':'2.6',
6732
'type':'container',
@@ -76,26 +41,6 @@ http {
7641
proxy_pass http://ruby_3_4_app/;
7742
proxy_redirect off;
7843
}
79-
location /ruby_3_3/ {
80-
proxy_pass http://ruby_3_3_app/;
81-
proxy_redirect off;
82-
}
83-
location /ruby_3_2/ {
84-
proxy_pass http://ruby_3_2_app/;
85-
proxy_redirect off;
86-
}
87-
location /ruby_3_1/ {
88-
proxy_pass http://ruby_3_1_app/;
89-
proxy_redirect off;
90-
}
91-
location /ruby_3_0/ {
92-
proxy_pass http://ruby_3_0_app/;
93-
proxy_redirect off;
94-
}
95-
location /ruby_2_7/ {
96-
proxy_pass http://ruby_2_7_app/;
97-
proxy_redirect off;
98-
}
9944
location /ruby_2_6/ {
10045
proxy_pass http://ruby_2_6_app/;
10146
proxy_redirect off;

0 commit comments

Comments
 (0)