diff --git a/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy b/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy index 866741d1b0e..17616a99eaf 100644 --- a/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy +++ b/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy @@ -71,12 +71,10 @@ CURRENT_RELEASES = ['8', '11', '17', '18', 'next'] SPECS = ['ppc64_aix' : CURRENT_RELEASES, 'ppc64le_linux' : CURRENT_RELEASES, 'ppc64le_linux_criu' : CURRENT_RELEASES, - 'ppc64le_linux_gcc10': ['17','18','next'], 'ppc64le_linux_gcc11': ['next'], 'ppc64le_linux_jit' : CURRENT_RELEASES, 's390x_linux' : CURRENT_RELEASES, 's390x_linux_criu' : CURRENT_RELEASES, - 's390x_linux_gcc10': ['17','18','next'], 's390x_linux_gcc11': ['next'], 's390x_linux_jit' : CURRENT_RELEASES, 's390x_zos' : ['11'], @@ -87,7 +85,6 @@ SPECS = ['ppc64_aix' : CURRENT_RELEASES, 's390x_zos_mixed' : ['11'], 'x86-64_linux' : CURRENT_RELEASES, 'x86-64_linux_criu': CURRENT_RELEASES, - 'x86-64_linux_gcc10': ['17','18','next'], 'x86-64_linux_gcc11': ['next'], 'x86-64_linux_jit' : CURRENT_RELEASES, 'x86-64_linux_valhalla' : ['next'], @@ -97,7 +94,6 @@ SPECS = ['ppc64_aix' : CURRENT_RELEASES, 'x86-64_windows' : CURRENT_RELEASES, 'aarch64_linux' : CURRENT_RELEASES, 'aarch64_linux_criu': CURRENT_RELEASES, - 'aarch64_linux_gcc10': ['17','18','next'], 'aarch64_mac' : CURRENT_RELEASES - '8', 'ppc64_aix_ojdk292' : ['8', '11'], 'ppc64le_linux_ojdk292' : ['8', '11'], @@ -135,17 +131,14 @@ SHORT_NAMES = ['all' : ['ppc64le_linux','s390x_linux','x86-64_linux','ppc64_aix' 'aix' : ['ppc64_aix'], 'zlinux' : ['s390x_linux'], 'zlinuxcriu' : ['s390x_linux_criu'], - 'zlinuxgcc10' : ['s390x_linux_gcc10'], 'zlinuxgcc11' : ['s390x_linux_gcc11'], 'zlinuxjit' : ['s390x_linux_jit'], 'plinux' : ['ppc64le_linux'], 'plinuxcriu' : ['ppc64le_linux_criu'], - 'plinuxgcc10' : ['ppc64le_linux_gcc10'], 'plinuxgcc11' : ['ppc64le_linux_gcc11'], 'plinuxjit' : ['ppc64le_linux_jit'], 'xlinux' : ['x86-64_linux'], 'xlinuxcriu' : ['x86-64_linux_criu'], - 'xlinuxgcc10' : ['x86-64_linux_gcc10'], 'xlinuxgcc11' : ['x86-64_linux_gcc11'], 'xlinuxjit' : ['x86-64_linux_jit'], 'xlinuxval' : ['x86-64_linux_valhalla'], @@ -156,7 +149,6 @@ SHORT_NAMES = ['all' : ['ppc64le_linux','s390x_linux','x86-64_linux','ppc64_aix' 'xmac' : ['x86-64_mac'], 'alinux64' : ['aarch64_linux'], 'alinux64criu' : ['aarch64_linux_criu'], - 'alinux64gcc10' : ['aarch64_linux_gcc10'], 'amac' : ['aarch64_mac'], 'zos' : ['s390x_zos'], 'zoscm' : ['s390x_zos_cm'], diff --git a/buildenv/jenkins/variables/defaults.yml b/buildenv/jenkins/variables/defaults.yml index 1d3f8429707..dbb339fecd0 100644 --- a/buildenv/jenkins/variables/defaults.yml +++ b/buildenv/jenkins/variables/defaults.yml @@ -207,7 +207,10 @@ ppc64le_linux: extra_configure_options: all: '--enable-jitserver' build_env: - cmd: 'source /home/jenkins/set_gcc7.5.0_env' + cmd: + all: 'source /home/jenkins/set_gcc_10.3.0_env' + 8: 'source /home/jenkins/set_gcc7.5.0_env' + 11: 'source /home/jenkins/set_gcc7.5.0_env' #========================================# # Linux PPCLE 64bits /w JITSERVER #========================================# @@ -230,7 +233,10 @@ s390x_linux: node_labels: build: 'ci.role.build && hw.arch.s390x && sw.os.rhel.7' build_env: - cmd: 'source /home/jenkins/set_gcc7.5.0_env' + cmd: + all: 'source /home/jenkins/set_gcc_10.3.0_env' + 8: 'source /home/jenkins/set_gcc7.5.0_env' + 11: 'source /home/jenkins/set_gcc7.5.0_env' #========================================# # Linux S390 64bits /w JITSERVER #========================================# @@ -289,9 +295,10 @@ x86-64_linux: all: '--enable-jitserver' build_env: cmd: - 17: 'source /home/jenkins/set_gcc7.5.0_env' - 18: 'source /home/jenkins/set_gcc7.5.0_env' - next: 'source /home/jenkins/set_gcc7.5.0_env' + all: 'source /home/jenkins/set_gcc_10.3.0_env' + 8: '' + 11: '' + # use default gcc for 8, 11 (v7.5) vars: 'OPENJ9_JAVA_OPTIONS=-Xdump:system+java:events=systhrow,filter=java/lang/ClassCastException,request=exclusive+prepwalk+preempt' extra_test_labels: 17: '!sw.os.cent.6' @@ -316,9 +323,12 @@ aarch64_linux: 11: 'linux-aarch64-normal-server-release' node_labels: build: 'ci.role.build && hw.arch.aarch64 && sw.tool.docker' - docker_image: 'adoptopenjdk/centos7_build_image@sha256:b2cc072a5c6196461a0993c6817d7540b8c8fcbce40f63cd5bb49eb6d7d61d89' + docker_image: 'adoptopenjdk/centos7_build_image@sha256:29d743c44245d788d674867c8ff24226f3a4dce3e4d82754d75d5e9ce33a3c69' build_env: - vars: 'CC=/usr/local/gcc/bin/gcc-7.5 CXX=/usr/local/gcc/bin/g++-7.5' + vars: + all: 'CC=/usr/local/gcc10/bin/gcc-10.3 CXX=/usr/local/gcc10/bin/g++-10.3' + 8: 'CC=/usr/local/gcc/bin/gcc-7.5 CXX=/usr/local/gcc/bin/g++-7.5' + 11: 'CC=/usr/local/gcc/bin/gcc-7.5 CXX=/usr/local/gcc/bin/g++-7.5' #========================================# # Windows x86 64bits #========================================# @@ -506,18 +516,15 @@ x86-64_linux_criu: extends: ['x86-64_linux', 'criu'] node_labels: build: - 11: 'ci.role.build && hw.arch.x86 && sw.os.cent.7' - 17: 'ci.role.build && hw.arch.x86 && sw.os.cent.7' - 18: 'ci.role.build && hw.arch.x86 && sw.os.cent.7' - next: 'ci.role.build && hw.arch.x86 && sw.os.cent.7' + all: 'ci.role.build && hw.arch.x86 && sw.os.cent.7' docker_image: + 8: '' 11: '' build_env: cmd: + all: 'source /home/jenkins/set_gcc_10.3.0_env' + 8: 'source /home/jenkins/set_gcc7.5.0_env' 11: 'source /home/jenkins/set_gcc7.5.0_env' - 17: 'source /home/jenkins/set_gcc7.5.0_env' - 18: 'source /home/jenkins/set_gcc7.5.0_env' - next: 'source /home/jenkins/set_gcc7.5.0_env' ppc64le_linux_criu: extends: ['ppc64le_linux', 'criu'] s390x_linux_criu: @@ -525,42 +532,6 @@ s390x_linux_criu: aarch64_linux_criu: extends: ['aarch64_linux', 'criu'] #========================================# -# Linux x86 64bits compiled with GCC 10 -#========================================# -x86-64_linux_gcc10: - extends: ['x86-64_linux'] - build_env: - cmd: - all: 'source /home/jenkins/set_gcc_10.3.0_env' - vars: 'OPENJ9_JAVA_OPTIONS=-Xdump:system+java:events=systhrow,filter=java/lang/ClassCastException,request=exclusive+prepwalk+preempt' -#========================================# -# Linux PPCLE 64bits compiled with GCC 10 -#========================================# -ppc64le_linux_gcc10: - extends: ['ppc64le_linux'] - build_env: - cmd: - all: 'source /home/jenkins/set_gcc_10.3.0_env' -#========================================# -# Linux s390x 64bits compiled with GCC 10 -#========================================# -s390x_linux_gcc10: - extends: ['s390x_linux'] - build_env: - cmd: - all: 'source /home/jenkins/set_gcc_10.3.0_env' -#========================================# -# Linux Aarch 64bits compiled with GCC 10 -#========================================# -aarch64_linux_gcc10: - extends: ['aarch64_linux'] - node_labels: - build: 'ci.role.build && hw.arch.aarch64 && sw.tool.docker' - docker_image: 'adoptopenjdk/centos7_build_image@sha256:29d743c44245d788d674867c8ff24226f3a4dce3e4d82754d75d5e9ce33a3c69' - build_env: - vars: - all: 'CC=/usr/local/gcc10/bin/gcc-10.3 CXX=/usr/local/gcc10/bin/g++-10.3' -#========================================# # Linux x86 64bits compiled with GCC 11 #========================================# x86-64_linux_gcc11: