mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-03 09:13:20 +03:00 
			
		
		
		
	ci: Don't specify amount of memory
The number of CPUs is the cost-determining factor. Most instance types that run tests have more memory/core than what we specified, there's no real benefit in wasting that. Reviewed-by: Daniel Gustafsson <daniel@yesql.se> Discussion: https://postgr.es/m/20230808021541.7lbzdefvma7qmn3w@awork3.anarazel.de Backpatch: 15-, where CI support was added
This commit is contained in:
		@@ -149,7 +149,6 @@ task:
 | 
				
			|||||||
    image: family/pg-ci-freebsd-13
 | 
					    image: family/pg-ci-freebsd-13
 | 
				
			||||||
    platform: freebsd
 | 
					    platform: freebsd
 | 
				
			||||||
    cpu: $CPUS
 | 
					    cpu: $CPUS
 | 
				
			||||||
    memory: 4G
 | 
					 | 
				
			||||||
    disk: 50
 | 
					    disk: 50
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  sysinfo_script: |
 | 
					  sysinfo_script: |
 | 
				
			||||||
@@ -291,7 +290,6 @@ task:
 | 
				
			|||||||
    image: family/pg-ci-bullseye
 | 
					    image: family/pg-ci-bullseye
 | 
				
			||||||
    platform: linux
 | 
					    platform: linux
 | 
				
			||||||
    cpu: $CPUS
 | 
					    cpu: $CPUS
 | 
				
			||||||
    memory: 4G
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  ccache_cache:
 | 
					  ccache_cache:
 | 
				
			||||||
    folder: ${CCACHE_DIR}
 | 
					    folder: ${CCACHE_DIR}
 | 
				
			||||||
@@ -558,7 +556,6 @@ task:
 | 
				
			|||||||
    image: family/pg-ci-windows-ci-vs-2019
 | 
					    image: family/pg-ci-windows-ci-vs-2019
 | 
				
			||||||
    platform: windows
 | 
					    platform: windows
 | 
				
			||||||
    cpu: $CPUS
 | 
					    cpu: $CPUS
 | 
				
			||||||
    memory: 4G
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  setup_additional_packages_script: |
 | 
					  setup_additional_packages_script: |
 | 
				
			||||||
    REM choco install -y --no-progress ...
 | 
					    REM choco install -y --no-progress ...
 | 
				
			||||||
@@ -606,7 +603,6 @@ task:
 | 
				
			|||||||
    image: family/pg-ci-windows-ci-mingw64
 | 
					    image: family/pg-ci-windows-ci-mingw64
 | 
				
			||||||
    platform: windows
 | 
					    platform: windows
 | 
				
			||||||
    cpu: $CPUS
 | 
					    cpu: $CPUS
 | 
				
			||||||
    memory: 4G
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  env:
 | 
					  env:
 | 
				
			||||||
    TEST_JOBS: 4 # higher concurrency causes occasional failures
 | 
					    TEST_JOBS: 4 # higher concurrency causes occasional failures
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user