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.

Author: lloeki

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

@@ -12,16 +12,16 @@ weblog:
             local_path: lib-injection/build/docker/ruby
           - name: copy-ruby3_4-app-dockerfile
             local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_4-alpine
-          - name: copy-ruby3_3-app-dockerfile
-            local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_3-alpine
-          - name: copy-ruby3_2-app-dockerfile
-            local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_2-alpine
-          - name: copy-ruby3_1-app-dockerfile
-            local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_1-alpine
-          - name: copy-ruby3_0-app-dockerfile
-            local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_0-alpine
-          - name: copy-ruby2_7-app-dockerfile
-            local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_2_7-alpine
+        # - name: copy-ruby3_3-app-dockerfile
+        #   local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_3-alpine
+        # - name: copy-ruby3_2-app-dockerfile
+        #   local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_2-alpine
+        # - name: copy-ruby3_1-app-dockerfile
+        #   local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_1-alpine
+        # - name: copy-ruby3_0-app-dockerfile
+        #   local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_3_0-alpine
+        # - name: copy-ruby2_7-app-dockerfile
+        #   local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_2_7-alpine
           - name: copy-ruby2_6-app-dockerfile
             local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multialpine/Dockerfile.ruby_2_6-alpine
           - name: copy-reverseproxy-dockerfile

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

@@ -12,16 +12,16 @@ weblog:
             local_path: lib-injection/build/docker/ruby
           - name: copy-ruby3_4-app-dockerfile
             local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_4
-          - name: copy-ruby3_3-app-dockerfile
-            local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3
-          - name: copy-ruby3_2-app-dockerfile
-            local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_2
-          - name: copy-ruby3_1-app-dockerfile
-            local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_1
-          - name: copy-ruby3_0-app-dockerfile
-            local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_0
-          - name: copy-ruby2_7-app-dockerfile
-            local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_7
+        # - name: copy-ruby3_3-app-dockerfile
+        #   local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_3
+        # - name: copy-ruby3_2-app-dockerfile
+        #   local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_2
+        # - name: copy-ruby3_1-app-dockerfile
+        #   local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_1
+        # - name: copy-ruby3_0-app-dockerfile
+        #   local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_3_0
+        # - name: copy-ruby2_7-app-dockerfile
+        #   local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_7
           - name: copy-ruby2_6-app-dockerfile
             local_path: utils/build/virtual_machine/weblogs/ruby/test-app-ruby-multicontainer/Dockerfile.ruby_2_6
           - name: copy-reverseproxy-dockerfile

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

@@ -12,65 +12,65 @@ services:
         healthcheck:
             test: "curl -f http://localhost:8080"
 
-    ruby_3_4:
-        env_file: "scenario_app.env"
-        image: system-tests/ruby_3_4:latest
-        restart: always
-        build:
-            context: .
-            dockerfile: Dockerfile.ruby_3_4-alpine
-        healthcheck:
-            test: "curl -f http://localhost:18080"
+#   ruby_3_4:
+#       env_file: "scenario_app.env"
+#       image: system-tests/ruby_3_4:latest
+#       restart: always
+#       build:
+#           context: .
+#           dockerfile: Dockerfile.ruby_3_4-alpine
+#       healthcheck:
+#           test: "curl -f http://localhost:18080"
 
-    ruby_3_3:
-        env_file: "scenario_app.env"
-        image: system-tests/ruby_3_3:latest
-        restart: always
-        build:
-            context: .
-            dockerfile: Dockerfile.ruby_3_3-alpine
-        healthcheck:
-            test: "curl -f http://localhost:18080"
+#   ruby_3_3:
+#       env_file: "scenario_app.env"
+#       image: system-tests/ruby_3_3:latest
+#       restart: always
+#       build:
+#           context: .
+#           dockerfile: Dockerfile.ruby_3_3-alpine
+#       healthcheck:
+#           test: "curl -f http://localhost:18080"
 
-    ruby_3_2:
-        env_file: "scenario_app.env"
-        image: system-tests/ruby_3_2:latest
-        restart: always
-        build:
-            context: .
-            dockerfile: Dockerfile.ruby_3_2-alpine
-        healthcheck:
-            test: "curl -f http://localhost:18080"
+#   ruby_3_2:
+#       env_file: "scenario_app.env"
+#       image: system-tests/ruby_3_2:latest
+#       restart: always
+#       build:
+#           context: .
+#           dockerfile: Dockerfile.ruby_3_2-alpine
+#       healthcheck:
+#           test: "curl -f http://localhost:18080"
 
-    ruby_3_1:
-        env_file: "scenario_app.env"
-        image: system-tests/ruby_3_1:latest
-        restart: always
-        build:
-            context: .
-            dockerfile: Dockerfile.ruby_3_1-alpine
-        healthcheck:
-            test: "curl -f http://localhost:18080"
+#   ruby_3_1:
+#       env_file: "scenario_app.env"
+#       image: system-tests/ruby_3_1:latest
+#       restart: always
+#       build:
+#           context: .
+#           dockerfile: Dockerfile.ruby_3_1-alpine
+#       healthcheck:
+#           test: "curl -f http://localhost:18080"
 
-    ruby_3_0:
-        env_file: "scenario_app.env"
-        image: system-tests/ruby_3_0:latest
-        restart: always
-        build:
-            context: .
-            dockerfile: Dockerfile.ruby_3_0-alpine
-        healthcheck:
-            test: "curl -f http://localhost:18080"
+#   ruby_3_0:
+#       env_file: "scenario_app.env"
+#       image: system-tests/ruby_3_0:latest
+#       restart: always
+#       build:
+#           context: .
+#           dockerfile: Dockerfile.ruby_3_0-alpine
+#       healthcheck:
+#           test: "curl -f http://localhost:18080"
 
-    ruby_2_7:
-        env_file: "scenario_app.env"
-        image: system-tests/ruby_2_7:latest
-        restart: always
-        build:
-            context: .
-            dockerfile: Dockerfile.ruby_2_7-alpine
-        healthcheck:
-            test: "curl -f http://localhost:18080"
+#   ruby_2_7:
+#       env_file: "scenario_app.env"
+#       image: system-tests/ruby_2_7:latest
+#       restart: always
+#       build:
+#           context: .
+#           dockerfile: Dockerfile.ruby_2_7-alpine
+#       healthcheck:
+#           test: "curl -f http://localhost:18080"
 
     ruby_2_6:
         env_file: "scenario_app.env"

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

@@ -43,26 +43,26 @@ http {
                     'type':'alpine',
                     'url':'/ruby_3_4/'
                 },{
-                    'runtime':'3.3',
-                    'type':'alpine',
-                    'url':'/ruby_3_3/'
-                },{
-                    'runtime':'3.2',
-                    'type':'alpine',
-                    'url':'/ruby_3_2/'
-                },{
-                    'runtime':'3.1',
-                    'type':'alpine',
-                    'url':'/ruby_3_1/'
-                },{
-                    'runtime':'3.0',
-                    'type':'alpine',
-                    'url':'/ruby_3_0/'
-                },{
-                    'runtime':'2.7',
-                    'type':'alpine',
-                    'url':'/ruby_2_7/'
-                },{
+            #       'runtime':'3.3',
+            #       'type':'alpine',
+            #       'url':'/ruby_3_3/'
+            #   },{
+            #       'runtime':'3.2',
+            #       'type':'alpine',
+            #       'url':'/ruby_3_2/'
+            #   },{
+            #       'runtime':'3.1',
+            #       'type':'alpine',
+            #       'url':'/ruby_3_1/'
+            #   },{
+            #       'runtime':'3.0',
+            #       'type':'alpine',
+            #       'url':'/ruby_3_0/'
+            #   },{
+            #       'runtime':'2.7',
+            #       'type':'alpine',
+            #       'url':'/ruby_2_7/'
+            #   },{
                     'runtime':'2.6',
                     'type':'alpine',
                     'url':'/ruby_2_6/'
@@ -76,26 +76,26 @@ http {
             proxy_pass         http://ruby_3_4_app/;
             proxy_redirect     off;
         }
-        location /ruby_3_3/ {
-            proxy_pass         http://ruby_3_3_app/;
-            proxy_redirect     off;
-        }
-        location /ruby_3_2/ {
-            proxy_pass         http://ruby_3_2_app/;
-            proxy_redirect     off;
-        }
-        location /ruby_3_1/ {
-            proxy_pass         http://ruby_3_1_app/;
-            proxy_redirect     off;
-        }
-        location /ruby_3_0/ {
-            proxy_pass         http://ruby_3_0_app/;
-            proxy_redirect     off;
-        }
-        location /ruby_2_7/ {
-            proxy_pass         http://ruby_2_7_app/;
-            proxy_redirect     off;
-        }
+    #   location /ruby_3_3/ {
+    #       proxy_pass         http://ruby_3_3_app/;
+    #       proxy_redirect     off;
+    #   }
+    #   location /ruby_3_2/ {
+    #       proxy_pass         http://ruby_3_2_app/;
+    #       proxy_redirect     off;
+    #   }
+    #   location /ruby_3_1/ {
+    #       proxy_pass         http://ruby_3_1_app/;
+    #       proxy_redirect     off;
+    #   }
+    #   location /ruby_3_0/ {
+    #       proxy_pass         http://ruby_3_0_app/;
+    #       proxy_redirect     off;
+    #   }
+    #   location /ruby_2_7/ {
+    #       proxy_pass         http://ruby_2_7_app/;
+    #       proxy_redirect     off;
+    #   }
         location /ruby_2_6/ {
             proxy_pass         http://ruby_2_6_app/;
             proxy_redirect     off;

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

@@ -22,55 +22,55 @@ services:
         healthcheck:
             test: "curl -f http://localhost:18080/"
 
-    ruby_3_3:
-        env_file: "scenario_app.env"
-        image: system-tests/ruby_3_3:latest
-        restart: always
-        build:
-            context: .
-            dockerfile: Dockerfile.ruby_3_3
-        healthcheck:
-            test: "curl -f http://localhost:18080/"
+#   ruby_3_3:
+#       env_file: "scenario_app.env"
+#       image: system-tests/ruby_3_3:latest
+#       restart: always
+#       build:
+#           context: .
+#           dockerfile: Dockerfile.ruby_3_3
+#       healthcheck:
+#           test: "curl -f http://localhost:18080/"
 
-    ruby_3_2:
-        env_file: "scenario_app.env"
-        image: system-tests/ruby_3_2:latest
-        restart: always
-        build:
-            context: .
-            dockerfile: Dockerfile.ruby_3_2
-        healthcheck:
-            test: "curl -f http://localhost:18080/"  
+#   ruby_3_2:
+#       env_file: "scenario_app.env"
+#       image: system-tests/ruby_3_2:latest
+#       restart: always
+#       build:
+#           context: .
+#           dockerfile: Dockerfile.ruby_3_2
+#       healthcheck:
+#           test: "curl -f http://localhost:18080/"  
 
-    ruby_3_1:
-        env_file: "scenario_app.env"
-        image: system-tests/ruby_3_1:latest
-        restart: always
-        build:
-            context: .
-            dockerfile: Dockerfile.ruby_3_1
-        healthcheck:
-            test: "curl -f http://localhost:18080/"  
+#   ruby_3_1:
+#       env_file: "scenario_app.env"
+#       image: system-tests/ruby_3_1:latest
+#       restart: always
+#       build:
+#           context: .
+#           dockerfile: Dockerfile.ruby_3_1
+#       healthcheck:
+#           test: "curl -f http://localhost:18080/"  
 
-    ruby_3_0:
-        env_file: "scenario_app.env"
-        image: system-tests/ruby_3_0:latest
-        restart: always
-        build:
-            context: .
-            dockerfile: Dockerfile.ruby_3_0
-        healthcheck:
-            test: "curl -f http://localhost:18080/"  
+#   ruby_3_0:
+#       env_file: "scenario_app.env"
+#       image: system-tests/ruby_3_0:latest
+#       restart: always
+#       build:
+#           context: .
+#           dockerfile: Dockerfile.ruby_3_0
+#       healthcheck:
+#           test: "curl -f http://localhost:18080/"  
 
-    ruby_2_7:
-        env_file: "scenario_app.env"
-        image: system-tests/ruby_2_7:latest
-        restart: always
-        build:
-            context: .
-            dockerfile: Dockerfile.ruby_2_7
-        healthcheck:
-            test: "curl -f http://localhost:18080/"  
+#   ruby_2_7:
+#       env_file: "scenario_app.env"
+#       image: system-tests/ruby_2_7:latest
+#       restart: always
+#       build:
+#           context: .
+#           dockerfile: Dockerfile.ruby_2_7
+#       healthcheck:
+#           test: "curl -f http://localhost:18080/"  
 
     ruby_2_6:
         env_file: "scenario_app.env"