From 6361c5c4bac7467893b1f629090712c8c0d736a8 Mon Sep 17 00:00:00 2001
From: Dan Mick <dmick@redhat.com>
Date: Wed, 18 Sep 2024 17:55:56 -0700
Subject: [PATCH] ceph-dev-new-*: change for in-tree container builds

- invoke ${SRC}/container/build.sh to build the container
- do not check out ceph-container.git
- add test to loop for "is repo ready" to test for the jenkins job
  url ${BUILD_URL} as well as ready, so that we're not racing against
  preexisting repos for this branch/os/flavor

Signed-off-by: Dan Mick <dmick@redhat.com>
---
 ceph-dev-new-build/build/build_rpm                   | 12 +++++-------
 ceph-dev-new-build/build/failure                     |  7 -------
 .../config/definitions/ceph-dev-new-build.yml        | 10 ----------
 ceph-dev-new/config/definitions/ceph-dev-new.yml     |  5 -----
 4 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/ceph-dev-new-build/build/build_rpm b/ceph-dev-new-build/build/build_rpm
index 5333efb3..c2a6ac5c 100644
--- a/ceph-dev-new-build/build/build_rpm
+++ b/ceph-dev-new-build/build/build_rpm
@@ -91,7 +91,8 @@ if [[ $CI_CONTAINER == "true" && $DISTRO == "centos" && "$RELEASE" =~ 8|9 ]] ; t
     loop=0
     ready=false
     while ((loop < 15)); do
-      if [[ $(curl -s "https://shaman.ceph.com/api/search/?project=ceph&distros=centos/${RELEASE}/${ARCH}&sha1=${SHA1}&ref=${BRANCH}&flavor=${FLAVOR}" | jq -r '.[0].status') == 'ready' ]] ; then ready=true; break; fi
+      curl -s "https://shaman.ceph.com/api/search/?project=ceph&distros=centos/${RELEASE}/${ARCH}&sha1=${SHA1}&ref=${BRANCH}&flavor=${FLAVOR}" > shaman.status
+      if [[ ($(jq -r '.[0].extra.build_url' < shaman.status) == ${BUILD_URL}) && ($(jq -r '.[0].status' < shaman.status) == 'ready') ]] ; then ready=true; break; fi
       ((loop = loop + 1))
       sleep 60
     done
@@ -102,12 +103,9 @@ if [[ $CI_CONTAINER == "true" && $DISTRO == "centos" && "$RELEASE" =~ 8|9 ]] ; t
       # update_build_status "failed" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH
       # exit 1
     fi
-
-    cd $WORKSPACE/ceph-container
-    sudo -E CI_CONTAINER=${CI_CONTAINER} SHA1=${SHA1} OSD_FLAVOR=${FLAVOR} CONTAINER_FLAVOR=${BRANCH},${DISTRO},${RELEASE} \
-      /bin/bash ./contrib/build-push-ceph-container-imgs.sh
-    cd $WORKSPACE
-    sudo rm -rf ceph-container
+    # get into $WORKSPACE/$dist/ceph-$cephver, where the copied source tree is
+    cd ${WORKSPACE}/dist/ceph-${cephver}/container
+    CEPH_SHA1=${SHA1} ./build.sh
 fi
 
 # update shaman with the completed build status
diff --git a/ceph-dev-new-build/build/failure b/ceph-dev-new-build/build/failure
index dcd38ebf..6274d32e 100644
--- a/ceph-dev-new-build/build/failure
+++ b/ceph-dev-new-build/build/failure
@@ -1,12 +1,5 @@
 #!/bin/bash -ex
 
-# The ceph-container dir is supposed to get deleted in the build_rpm script.
-# We used to add '|| true' to the container build so the dir would still get
-# deleted even if it failed.  This changed in https://github.com/ceph/ceph-build/pull/1603
-# So now we need to delete the directory or the Wipe Workspace plugin will fail on the next build.
-cd $WORKSPACE
-sudo rm -rf ceph-container
-
 # note: the failed_build_status call relies on normalized variable names that
 # are infered by the builds themselves. If the build fails before these are
 # set, they will be posted with empty values
diff --git a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
index 336e2688..ef75882f 100644
--- a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
+++ b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
@@ -14,16 +14,6 @@
           days-to-keep: 30
           artifact-days-to-keep: 30
 
-    scm:
-      - git:
-          url: git@github.com:ceph/ceph-container.git
-          basedir: ceph-container
-          credentials-id: 'jenkins-build'
-          branches:
-            - $CONTAINER_BRANCH
-          skip-tag: true
-          wipe-workspace: true
-
     execution-strategy:
        combination-filter: |
          DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH &&
diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml
index 55f030a2..dca94364 100644
--- a/ceph-dev-new/config/definitions/ceph-dev-new.yml
+++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml
@@ -65,11 +65,6 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           description: 'Build container with development release of Ceph.  Note: this must be "false" or "true" so that it can execute a command or satisfy a string comparison'
           default: "true"
 
-      - string:
-          name: CONTAINER_BRANCH
-          description: "For CI_CONTAINER: Branch of ceph-container to use"
-          default: main
-
       - string:
           name: CONTAINER_REPO_HOSTNAME
           description: "For CI_CONTAINER: Name of container repo server (i.e. 'quay.io')"
-- 
2.39.5