@@ -68,6 +68,8 @@ lock(resource: "build-node-image") {
68
68
def (container_registry_staging_repo, container_registry_repo_and_tag) = pipeutils.get_ocp_node_registry_repo(pipecfg, params.RELEASE)
69
69
def container_registry_staging_manifest_tag = "${params.RELEASE}-${shortcommit}"
70
70
def container_registry_staging_image_tag = "${params.RELEASE}-${shortcommit}"
71
+ def container_registry_staging_manifest = "${container_registry_staging_repo}:${container_registry_staging_manifest_tag}"
72
+
71
73
// add any additional root CA cert before we do anything that fetches
72
74
pipeutils.addOptionalRootCA()
73
75
@@ -87,16 +89,36 @@ lock(resource: "build-node-image") {
87
89
staging_repository: container_registry_staging_repo,
88
90
image_tag_staging: container_registry_staging_image_tag,
89
91
manifest_tag_staging: container_registry_staging_manifest_tag,
90
- secret: "id=yumrepos,src=\$(pwd)/yumrepos/${stream_info.yumrepo.file }",
92
+ secret: "id=yumrepos,src=\$(pwd)/yumrepos/${stream_info.yumrepo.files[0] }",
91
93
from: build_from,
92
94
extra_build_args: ["--security-opt label=disable", "--mount-host-ca-certs", "--force"])
93
95
}
94
96
}
95
-
96
- stage("Release Manifest") {
97
+ stage('Build Extensions Container') {
98
+ withCredentials([file(credentialsId: 'oscontainer-push-registry-secret', variable: 'REGISTRY_AUTH_FILE')]) {
99
+ // Use the node image as from
100
+ def build_from = container_registry_staging_manifest
101
+ def repos = stream_info.yumrepo.files
102
+ for (repo in repos) {
103
+ shwrap(""" cat yumrepos/${repo} >> /tmp/final_repo """)
104
+ }
105
+ pipeutils.build_and_push_image(arches: arches,
106
+ src_commit: commit,
107
+ src_url: src_config_url,
108
+ staging_repository: container_registry_staging_repo,
109
+ image_tag_staging: "${container_registry_staging_image_tag}-extensions",
110
+ manifest_tag_staging: "${container_registry_staging_manifest_tag}-extensions",
111
+ secret: "id=yumrepos,src=/tmp/final_repo",
112
+ from: build_from,
113
+ extra_build_args: ["--security-opt label=disable", "--mount-host-ca-certs",
114
+ "--git-containerfile", "extensions/Dockerfile", "--force"])
115
+ }
116
+ }
117
+ stage("Release Manifests") {
97
118
withCredentials([file(credentialsId: 'oscontainer-push-registry-secret', variable: 'REGISTRY_AUTH_FILE')]) {
98
- pipeutils.copy_image("${container_registry_staging_repo}:${container_registry_staging_manifest_tag}",
99
- container_registry_repo_and_tag, REGISTRY_AUTH_FILE)
119
+ pipeutils.copy_image(container_registry_staging_manifest, container_registry_repo_and_tag, REGISTRY_AUTH_FILE)
120
+ pipeutils.copy_image("${container_registry_staging_manifest}-extensions",
121
+ "${container_registry_repo_and_tag}-extensions", REGISTRY_AUTH_FILE)
100
122
}
101
123
}
102
124
currentBuild.result = 'SUCCESS'
0 commit comments