diff --git a/ee/lib/remote_development/workspaces/create/project_cloner_component_injector.rb b/ee/lib/remote_development/workspaces/create/project_cloner_component_injector.rb index aa87cb23b79cbb54e0c83f1af522e455cb644a70..a5e05c2c43372b875b340a811bebd0eef12b1567 100644 --- a/ee/lib/remote_development/workspaces/create/project_cloner_component_injector.rb +++ b/ee/lib/remote_development/workspaces/create/project_cloner_component_injector.rb @@ -56,8 +56,8 @@ def self.inject(context) # command has been overridden here as the default command in the alpine/git # container invokes git directly 'command' => %w[/bin/sh -c], - 'memoryLimit' => '256Mi', - 'memoryRequest' => '128Mi', + 'memoryLimit' => '512Mi', + 'memoryRequest' => '256Mi', 'cpuLimit' => '500m', 'cpuRequest' => '100m' } diff --git a/ee/lib/remote_development/workspaces/create/tools_component_injector.rb b/ee/lib/remote_development/workspaces/create/tools_component_injector.rb index d5e6a0696f4eee1c27e1e3ed2c714ec2bbc050bd..00fd644c27cc3a17d53833032cb5914232ada839 100644 --- a/ee/lib/remote_development/workspaces/create/tools_component_injector.rb +++ b/ee/lib/remote_development/workspaces/create/tools_component_injector.rb @@ -154,8 +154,8 @@ def self.tools_components(tools_dir:, image:) 'value' => tools_dir } ], - 'memoryLimit' => '256Mi', - 'memoryRequest' => '128Mi', + 'memoryLimit' => '512Mi', + 'memoryRequest' => '256Mi', 'cpuLimit' => '500m', 'cpuRequest' => '100m' } diff --git a/ee/lib/remote_development/workspaces/create/volume_component_injector.rb b/ee/lib/remote_development/workspaces/create/volume_component_injector.rb index 9e11750686569d677b864644a2ad63f02e0af2a3..c3aca03ea2e64e3935da95bc112f7287bc1b1af5 100644 --- a/ee/lib/remote_development/workspaces/create/volume_component_injector.rb +++ b/ee/lib/remote_development/workspaces/create/volume_component_injector.rb @@ -19,7 +19,7 @@ def self.inject(context) volume_component = { 'name' => volume_name, 'volume' => { - 'size' => '15Gi' + 'size' => '50Gi' } } diff --git a/ee/spec/fixtures/remote_development/example.processed-devfile-v2.yaml b/ee/spec/fixtures/remote_development/example.processed-devfile-v2.yaml index 0afce736c8d6927afd9dcb7f1542f32e5b56ead6..a2a0e28ba4640aec32d530bed5943152c9e3402d 100644 --- a/ee/spec/fixtures/remote_development/example.processed-devfile-v2.yaml +++ b/ee/spec/fixtures/remote_development/example.processed-devfile-v2.yaml @@ -66,8 +66,8 @@ components: env: - name: GL_TOOLS_DIR value: "/projects/.gl-tools" - memoryLimit: 256Mi - memoryRequest: 128Mi + memoryLimit: 512Mi + memoryRequest: 256Mi cpuLimit: 500m cpuRequest: 100m - name: gl-cloner-injector @@ -85,13 +85,13 @@ components: command: - "/bin/sh" - "-c" - memoryLimit: 256Mi - memoryRequest: 128Mi + memoryLimit: 512Mi + memoryRequest: 256Mi cpuLimit: 500m cpuRequest: 100m - name: gl-workspace-data volume: - size: 15Gi + size: 50Gi events: preStart: - gl-tools-injector-command diff --git a/ee/spec/fixtures/remote_development/example.processed-devfile.yaml b/ee/spec/fixtures/remote_development/example.processed-devfile.yaml index 0afce736c8d6927afd9dcb7f1542f32e5b56ead6..a2a0e28ba4640aec32d530bed5943152c9e3402d 100644 --- a/ee/spec/fixtures/remote_development/example.processed-devfile.yaml +++ b/ee/spec/fixtures/remote_development/example.processed-devfile.yaml @@ -66,8 +66,8 @@ components: env: - name: GL_TOOLS_DIR value: "/projects/.gl-tools" - memoryLimit: 256Mi - memoryRequest: 128Mi + memoryLimit: 512Mi + memoryRequest: 256Mi cpuLimit: 500m cpuRequest: 100m - name: gl-cloner-injector @@ -85,13 +85,13 @@ components: command: - "/bin/sh" - "-c" - memoryLimit: 256Mi - memoryRequest: 128Mi + memoryLimit: 512Mi + memoryRequest: 256Mi cpuLimit: 500m cpuRequest: 100m - name: gl-workspace-data volume: - size: 15Gi + size: 50Gi events: preStart: - gl-tools-injector-command diff --git a/ee/spec/fixtures/remote_development/example.processed-marketplace-disabled-devfile.yaml b/ee/spec/fixtures/remote_development/example.processed-marketplace-disabled-devfile.yaml index 6379e25fa347e14dec18cf12ccb070053e8554cf..c5f7735dc02fa349df8ddcfd5260e050f65080e5 100644 --- a/ee/spec/fixtures/remote_development/example.processed-marketplace-disabled-devfile.yaml +++ b/ee/spec/fixtures/remote_development/example.processed-marketplace-disabled-devfile.yaml @@ -48,7 +48,7 @@ components: mountSources: true - name: gl-workspace-data volume: - size: 15Gi + size: 50Gi - name: gl-tools-injector container: image: registry.gitlab.com/gitlab-org/remote-development/gitlab-workspaces-tools:2.0.0 @@ -58,8 +58,8 @@ components: env: - name: GL_TOOLS_DIR value: "/projects/.gl-tools" - memoryLimit: 256Mi - memoryRequest: 128Mi + memoryLimit: 512Mi + memoryRequest: 256Mi cpuLimit: 500m cpuRequest: 100m - name: gl-cloner-injector @@ -77,8 +77,8 @@ components: command: - "/bin/sh" - "-c" - memoryLimit: 256Mi - memoryRequest: 128Mi + memoryLimit: 512Mi + memoryRequest: 256Mi cpuLimit: 500m cpuRequest: 100m events: diff --git a/ee/spec/fixtures/remote_development/example.project-cloner-injected-devfile.yaml b/ee/spec/fixtures/remote_development/example.project-cloner-injected-devfile.yaml index e5f2079028d888f8881451dda8b154e3372d8027..950a924c37d40b5fcf8661fadaf053a5e0de996e 100644 --- a/ee/spec/fixtures/remote_development/example.project-cloner-injected-devfile.yaml +++ b/ee/spec/fixtures/remote_development/example.project-cloner-injected-devfile.yaml @@ -57,8 +57,8 @@ components: env: - name: GL_TOOLS_DIR value: "/projects/.gl-tools" - memoryLimit: 256Mi - memoryRequest: 128Mi + memoryLimit: 512Mi + memoryRequest: 256Mi cpuLimit: 500m cpuRequest: 100m - name: gl-cloner-injector @@ -73,8 +73,8 @@ components: command: - "/bin/sh" - "-c" - memoryLimit: 256Mi - memoryRequest: 128Mi + memoryLimit: 512Mi + memoryRequest: 256Mi cpuLimit: 500m cpuRequest: 100m events: diff --git a/ee/spec/fixtures/remote_development/example.tools-injected-devfile.yaml b/ee/spec/fixtures/remote_development/example.tools-injected-devfile.yaml index f59219400a2938b0c8b587cd7f133a2ac5e8d14b..e7f2664b8e192c007b7ebc652b729308e2ac93e7 100644 --- a/ee/spec/fixtures/remote_development/example.tools-injected-devfile.yaml +++ b/ee/spec/fixtures/remote_development/example.tools-injected-devfile.yaml @@ -57,8 +57,8 @@ components: env: - name: GL_TOOLS_DIR value: "/projects/.gl-tools" - memoryLimit: 256Mi - memoryRequest: 128Mi + memoryLimit: 512Mi + memoryRequest: 256Mi cpuLimit: 500m cpuRequest: 100m events: diff --git a/ee/spec/fixtures/remote_development/example.tools-injected-marketplace-disabled-devfile.yaml b/ee/spec/fixtures/remote_development/example.tools-injected-marketplace-disabled-devfile.yaml index 06178b6fcfc636b973ba988483a78b2dd9e26802..b5cc3ee036ba704dc947cc0cd7536f6c25d8a2ab 100644 --- a/ee/spec/fixtures/remote_development/example.tools-injected-marketplace-disabled-devfile.yaml +++ b/ee/spec/fixtures/remote_development/example.tools-injected-marketplace-disabled-devfile.yaml @@ -57,8 +57,8 @@ components: env: - name: GL_TOOLS_DIR value: "/projects/.gl-tools" - memoryLimit: 256Mi - memoryRequest: 128Mi + memoryLimit: 512Mi + memoryRequest: 256Mi cpuLimit: 500m cpuRequest: 100m events: diff --git a/ee/spec/lib/remote_development/workspaces/create/main_integration_spec.rb b/ee/spec/lib/remote_development/workspaces/create/main_integration_spec.rb index b58d50795d6d3679e9cd25839c339f4576a7c334..9045a93130acafbe0dd327051356ad2a04455054 100644 --- a/ee/spec/lib/remote_development/workspaces/create/main_integration_spec.rb +++ b/ee/spec/lib/remote_development/workspaces/create/main_integration_spec.rb @@ -18,7 +18,7 @@ let(:devfile_path) { '.devfile.yaml' } let(:devfile_fixture_name) { 'example.devfile.yaml' } let(:devfile_yaml) { read_devfile(devfile_fixture_name) } - let(:processed_devfile) { YAML.safe_load(example_processed_devfile).to_h } + let(:expected_processed_devfile) { YAML.safe_load(example_processed_devfile).to_h } let(:editor) { 'webide' } let(:workspace_root) { '/projects' } let(:variables) do @@ -122,7 +122,7 @@ expect(workspace.devfile).to eq(devfile_yaml) actual_processed_devfile = YAML.safe_load(workspace.processed_devfile).to_h - expect(actual_processed_devfile).to eq(processed_devfile) + expect(actual_processed_devfile).to eq(expected_processed_devfile) variables.each do |variable| expect( diff --git a/ee/spec/support/shared_contexts/remote_development/remote_development_shared_contexts.rb b/ee/spec/support/shared_contexts/remote_development/remote_development_shared_contexts.rb index 77b506f1c5dd24f257c2c7947722bf03d01745b7..9dcf56d2d63806f4c0af4c1e5003043eb9086f3e 100644 --- a/ee/spec/support/shared_contexts/remote_development/remote_development_shared_contexts.rb +++ b/ee/spec/support/shared_contexts/remote_development/remote_development_shared_contexts.rb @@ -768,11 +768,11 @@ def workspace_deployment( resources: { limits: { cpu: "500m", - memory: "256Mi" + memory: "512Mi" }, requests: { cpu: "100m", - memory: "128Mi" + memory: "256Mi" } }, volumeMounts: [ @@ -820,11 +820,11 @@ def workspace_deployment( resources: { limits: { cpu: "500m", - memory: "256Mi" + memory: "512Mi" }, requests: { cpu: "100m", - memory: "128Mi" + memory: "256Mi" } }, volumeMounts: [ @@ -945,7 +945,7 @@ def workspace_pvc( ], resources: { requests: { - storage: "15Gi" + storage: "50Gi" } } }, diff --git a/scripts/remote_development/run-smoke-test-suite.sh b/scripts/remote_development/run-smoke-test-suite.sh index 1b9d119f3ff90a4ce0c8b5822082ef404516fff6..b4aa0c1fd568954aa6d138c290fbce86e848cc52 100755 --- a/scripts/remote_development/run-smoke-test-suite.sh +++ b/scripts/remote_development/run-smoke-test-suite.sh @@ -100,7 +100,7 @@ function run_rspec_rails_non_fast { "spec/support_specs/matchers/result_matchers_spec.rb" ) - bin/rspec "${files_for_rails[@]}" + bin/rspec --format documentation "${files_for_rails[@]}" } function run_rspec_feature {