Merge branch 'ceph:devel' into devel

ceph · Nov 27, 2024 · e693dde · e693dde
2 parents a16683f + 6b10615
commit e693dde
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 38 deletions.
diff --git a/.env b/.env
@@ -71,7 +71,7 @@ CEPH_SHA=latest
 CEPH_DEVEL_MGR_PATH=../ceph
 
 # Atom
-ATOM_SHA=337922522c1ab22e0969f1e04d10f0d88c08509c
+ATOM_SHA=14330a7bbc0bcf0177271db26c690be2573fb3a9
 
 # Demo settings
 RBD_POOL=rbd

diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
@@ -716,3 +716,38 @@ jobs:
           make push
           make push TAG_SUFFIX="-arm64"
           make push-manifest-list
+
+  push-devel-image-to-ceph-registry:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/devel'
+    needs: [pytest, demo, discovery, ha, atom]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download container images
+        uses: actions/download-artifact@v4
+        with:
+          pattern: container_images_nvmeof*
+          merge-multiple: true
+
+      - name: Load container images
+        run: |
+          docker load < nvmeof.tar
+          docker load < nvmeof-cli.tar
+
+      - name: Login to quay.io
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ vars.CONTAINER_REGISTRY }}
+          username: '${{ vars.CONTAINER_REGISTRY_USERNAME }}'
+          password: '${{ secrets.CONTAINER_REGISTRY_PASSWORD }}'
+
+      - name: Publish nvmeof containers when merged to devel
+        run: |
+          . .env
+          for image in nvmeof nvmeof-cli; do
+            docker tag $CONTAINER_REGISTRY/$image:$NVMEOF_VERSION $CONTAINER_REGISTRY/$image:devel
+            docker push $CONTAINER_REGISTRY/$image:devel
+          done
diff --git a/tests/atom/clusterBuildTestsRun.sh b/tests/atom/clusterBuildTestsRun.sh
@@ -70,46 +70,74 @@ if [ "$5" != "nightly" ]; then
     sudo docker run \
         -v /root/.ssh:/root/.ssh \
         nvmeof_atom:"$ATOM_SHA" \
-        python3 cephnvme_atom.py \
-        nvmeof \
-        quay.ceph.io/ceph-ci/ceph:"$CEPH_SHA" \
-        quay.io/ceph/nvmeof:"$VERSION" \
-        quay.io/ceph/nvmeof-cli:"$VERSION" \
-        None None None None None None 1 1 4 1 1 2 4 1024 2 2 200M 0 1 20 10 1 \
-        --stopNvmeofDaemon \
-        --stopNvmeofSystemctl \
-        --stopMonLeader \
-        --killMonClient \
-        --rmNvmeofDaemon \
-        --redeployGWs \
-        --gitHubActionDeployment \
-        --dontUseMTLS \
-        --skiplbTest \
-        --journalctlToConsole \
-        --dontPowerOffCloudVMs noKey noKey \
-        --multiIBMCloudServers_m6
+        python3 atom.py \
+        --project=nvmeof \
+        --ceph-img=quay.ceph.io/ceph-ci/ceph:"$CEPH_SHA" \
+        --gw-img=quay.io/ceph/nvmeof:"$VERSION" \
+        --cli-img=quay.io/ceph/nvmeof-cli:"$VERSION" \
+        --initiators=1 \
+        --gw-group-num=1 \
+        --gw-num=4 \
+        --gw-to-stop-num=1 \
+        --gw-scale-down-num=1 \
+        --subsystem-num=2 \
+        --ns-num=4 \
+        --subsystem-max-ns-num=1024 \
+        --failover-num=2 \
+        --failover-num-after-upgrade=2 \
+        --rbd-size=200M \
+        --fio-devices-num=1 \
+        --lb-timeout=20 \
+        --config-dbg-mon=10 \
+        --config-dbg-ms=1 \
+        --nvmeof-daemon-stop \
+        --nvmeof-systemctl-stop \
+        --mon-leader-stop \
+        --mon-client-kill \
+        --nvmeof-daemon-remove \
+        --redeploy-gws \
+        --github-action-deployment \
+        --dont-use-mtls \
+        --skip-lb-test \
+        --journalctl-to-console \
+        --dont-power-off-cloud-vms \
+        --env=m6
 else
     sudo docker run \
         -v /root/.ssh:/root/.ssh \
         nvmeof_atom:"$ATOM_SHA" \
-        python3 cephnvme_atom.py \
-        nvmeof \
-        quay.ceph.io/ceph-ci/ceph:"$CEPH_SHA" \
-        quay.io/ceph/nvmeof:"$VERSION" \
-        quay.io/ceph/nvmeof-cli:"$VERSION" \
-        None None None None None None 1 1 4 1 1 10 90 1024 6 2 200M 0 1 20 10 1 \
-        --stopNvmeofDaemon \
-        --stopNvmeofSystemctl \
-        --stopMonLeader \
-        --killMonClient \
-        --rmNvmeofDaemon \
-        --redeployGWs \
-        --gitHubActionDeployment \
-        --dontUseHUGEPAGES \
-        --dontUseMTLS \
-        --skiplbTest \
-        --journalctlToConsole \
-        --dontPowerOffCloudVMs noKey noKey \
-        --multiIBMCloudServers_m6
+        python3 atom.py \
+        --project=nvmeof \
+        --ceph-img=quay.ceph.io/ceph-ci/ceph:"$CEPH_SHA" \
+        --gw-img=quay.io/ceph/nvmeof:"$VERSION" \
+        --cli-img=quay.io/ceph/nvmeof-cli:"$VERSION" \
+        --initiators=1 \
+        --gw-group-num=1 \
+        --gw-num=4 \
+        --gw-to-stop-num=1 \
+        --gw-scale-down-num=1 \
+        --subsystem-num=10 \
+        --ns-num=90 \
+        --subsystem-max-ns-num=1024 \
+        --failover-num=6 \
+        --failover-num-after-upgrade=2 \
+        --rbd-size=200M \
+        --fio-devices-num=1 \
+        --lb-timeout=20 \
+        --config-dbg-mon=10 \
+        --config-dbg-ms=1 \
+        --nvmeof-daemon-stop \
+        --nvmeof-systemctl-stop \
+        --mon-leader-stop \
+        --mon-client-kill \
+        --nvmeof-daemon-remove \
+        --redeploy-gws \
+        --github-action-deployment \
+        --dont-use-mtls \
+        --skip-lb-test \
+        --journalctl-to-console \
+        --dont-power-off-cloud-vms \
+        --dont-use-hugepages \
+        --env=m6
 fi
 set +x