make OCL more OKD-friendly

pkg/controller/build/build_controller.go

@@ -1521,9 +1521,16 @@ func (ctrl *Controller) getConfigAndBuildForPool(pool *mcfgv1.MachineConfigPool)
 // Determines if the build pod is in an error state by examining the individual
 // container statuses. Returns true if a single container is in an error state.
 func isBuildPodError(pod *corev1.Pod) bool {
+ errStates := map[string]struct{}{
+ "ErrImagePull": struct{}{},
+ "CreateContainerError": struct{}{},
+ }
+
  for _, container := range pod.Status.ContainerStatuses {
- if container.State.Waiting != nil && container.State.Waiting.Reason == "ErrImagePull" {
- return true
+ if container.State.Waiting != nil {
+ if _, ok := errStates[container.State.Waiting.Reason]; ok {
+ return true
+ }
  }
 
  if container.State.Terminated != nil && container.State.Terminated.ExitCode != 0 {

pkg/controller/build/image_build_request.go

@@ -421,10 +421,6 @@ func (i ImageBuildRequest) toBuildahPod() *corev1.Pod {
  Name: "done",
  MountPath: "/tmp/done",
  },
- {
- Name: "buildah-cache",
- MountPath: "/home/build/.local/share/containers",
- },
  }
 
  volumes := []corev1.Volume{
@@ -608,7 +604,11 @@ func (i ImageBuildRequest) toBuildahPod() *corev1.Pod {
  Command: append(command, buildahBuildScript),
  ImagePullPolicy: corev1.PullAlways,
  SecurityContext: securityContext,
- VolumeMounts: volumeMounts,
+ // Only attach the buildah-cache volume mount to the buildah container.
+ VolumeMounts: append(volumeMounts, corev1.VolumeMount{
+ Name: "buildah-cache",
+ MountPath: "/home/build/.local/share/containers",
+ }),
  },
  {
  // This container waits for the aforementioned container to finish

test/e2e-techpreview/Containerfile.okd-fcos

@@ -0,0 +1,3 @@
+FROM configs AS final
+RUN rpm-ostree install cowsay && \
+ ostree container commit

test/e2e-techpreview/helpers_test.go

@@ -495,6 +495,17 @@ func skipOnOKD(t *testing.T) {
  }
 }
 
+func skipOnOCP(t *testing.T) {
+ cs := framework.NewClientSet("")
+ isOKD, err := helpers.IsOKDCluster(cs)
+ require.NoError(t, err)
+
+ if !isOKD {
+ t.Logf("OCP detected, skipping test %s", t.Name())
+ t.Skip()
+ }
+}
+
 // Extracts the contents of a directory within a given container to a temporary
 // directory. Next, it loads them into a bytes map keyed by filename. It does
 // not handle nested directories, so use with caution.

test/e2e-techpreview/onclusterbuild_test.go

@@ -52,6 +52,9 @@ var (
  // content is mounted into the build context by the BuildController.
  //go:embed Containerfile.yum-repos-d
  yumReposDockerfile string
+
+ //go:embed Containerfile.okd-fcos
+ okdFcosDockerfile string
 )
 
 var skipCleanup bool
@@ -82,6 +85,17 @@ type onClusterBuildTestOpts struct {
  useYumRepos bool
 }
 
+func TestOnClusterBuildsOnOKD(t *testing.T) {
+ skipOnOCP(t)
+
+ runOnClusterBuildTest(t, onClusterBuildTestOpts{
+ poolName: layeredMCPName,
+ customDockerfiles: map[string]string{
+ layeredMCPName: okdFcosDockerfile,
+ },
+ })
+}
+
 // Tests tha an on-cluster build can be performed with the Custom Pod Builder.
 func TestOnClusterBuildsCustomPodBuilder(t *testing.T) {
  runOnClusterBuildTest(t, onClusterBuildTestOpts{