Skip to content

Commit 0ec2da3

Browse files
authored
tools: Add Ubuntu 2404 ppc64le and s390x aqa test images (adoptium#4229)
1 parent 9195e92 commit 0ec2da3

File tree

1 file changed

+23
-9
lines changed

1 file changed

+23
-9
lines changed

ansible/docker/Jenkinsfile.test

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,22 @@ pipeline {
3535
dockerBuild('arm64', 'ubi10', 'Dockerfile.ubi10')
3636
}
3737
}
38-
// stage('UBI10 ppc64le') {
39-
// agent {
40-
// label "dockerBuild&&linux&&ppc64le"
41-
// }
42-
// steps {
43-
// dockerBuild('ppc64le', 'ubi10', 'Dockerfile.ubi10')
44-
// }
45-
// }
38+
stage('Ubuntu24.04 s390x') {
39+
agent {
40+
label "dockerBuild&&linux&&s390x"
41+
}
42+
steps {
43+
dockerBuild('s390x', 'ubuntu2404', 'Dockerfile.u2404')
44+
}
45+
}
46+
stage('Ubuntu24.04 ppc64le') {
47+
agent {
48+
label "dockerBuild&&linux&&ppc64le"
49+
}
50+
steps {
51+
dockerBuild('ppc64le', 'ubuntu2404', 'Dockerfile.u2404')
52+
}
53+
}
4654
}
4755
}
4856
stage('Docker Manifest') {
@@ -97,13 +105,19 @@ def dockerManifest() {
97105
export TARGET="ghcr.io/adoptium/test-containers:ubuntu2404"
98106
AMD64=${TARGET}-amd64
99107
ARM64=${TARGET}-arm64
108+
S390X=${TARGET}-s390x
109+
PPC64LE=${TARGET}-ppc64le
100110
echo "Debug SF01"
101111
docker manifest inspect $AMD64 2>/dev/null | grep mediaType
102112
docker manifest inspect $ARM64 2>/dev/null | grep mediaType
113+
docker manifest inspect $S390X 2>/dev/null | grep mediaType
114+
docker manifest inspect $PPC64LE 2>/dev/null | grep mediaType
103115
echo "Debug SF01"
104-
docker manifest create $TARGET $AMD64 $ARM64
116+
docker manifest create $TARGET $AMD64 $ARM64 $S390X $PPC64LE
105117
docker manifest annotate $TARGET $AMD64 --arch amd64 --os linux
106118
docker manifest annotate $TARGET $ARM64 --arch arm64 --os linux
119+
docker manifest annotate $TARGET $S390X --arch s390x --os linux
120+
docker manifest annotate $TARGET $PPC64LE --arch ppc64le --os linux
107121
docker manifest push $TARGET
108122

109123
# UBI10

0 commit comments

Comments
 (0)