Add containers/teuthology-dev

This is nearly identical to docs/docker-compose/teuthology, but with some changes to better work with ceph-devstack. The bits in docs/docker-compose should be able to be adapted easily to work with this container. Signed-off-by: Zack Cerza <[email protected]>
ceph · Sep 26, 2023 · 6a3c353 · 6a3c353
1 parent 54e62bc
commit 6a3c353
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 22 deletions.
diff --git a/...ocker-compose/teuthology/.teuthology.yaml → containers/teuthology-dev/.teuthology.yaml b/...ocker-compose/teuthology/.teuthology.yaml → containers/teuthology-dev/.teuthology.yaml
diff --git a/docs/docker-compose/teuthology/Dockerfile → containers/teuthology-dev/Dockerfile b/docs/docker-compose/teuthology/Dockerfile → containers/teuthology-dev/Dockerfile
@@ -1,5 +1,4 @@
-FROM ubuntu:latest
-ARG SSH_PRIVKEY_FILE=id_ed25519
+FROM ubuntu:focal
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
     apt-get install -y \
@@ -28,16 +27,13 @@ RUN \
 COPY . /teuthology
 RUN \
     ./bootstrap
-COPY docs/docker-compose/teuthology/containerized_node.yaml /teuthology
-COPY docs/docker-compose/teuthology/.teuthology.yaml /root
-COPY docs/docker-compose/teuthology/teuthology.sh /
-RUN mkdir -p /etc/ansible
-COPY docs/docker-compose/teuthology/ansible_inventory/hosts /etc/ansible/
-COPY docs/docker-compose/teuthology/ansible_inventory/secrets /etc/ansible/
+COPY containers/teuthology-dev/containerized_node.yaml /teuthology
+COPY containers/teuthology-dev/.teuthology.yaml /root
+COPY containers/teuthology-dev/teuthology.sh /
 RUN \
     mkdir $HOME/.ssh && \
-    touch $HOME/.ssh/${SSH_PRIVKEY_FILE} && \
-    chmod 600 $HOME/.ssh/${SSH_PRIVKEY_FILE} && \
+    touch $HOME/.ssh/id_rsa && \
+    chmod 600 $HOME/.ssh/id_rsa && \
     echo "StrictHostKeyChecking=no" > $HOME/.ssh/config && \
     echo "UserKnownHostsFile=/dev/null" >> $HOME/.ssh/config
-ENTRYPOINT /teuthology.sh
+ENTRYPOINT /teuthology.sh
diff --git a/...ompose/teuthology/containerized_node.yaml → ...rs/teuthology-dev/containerized_node.yaml b/...ompose/teuthology/containerized_node.yaml → ...rs/teuthology-dev/containerized_node.yaml
@@ -6,3 +6,7 @@ overrides:
       ansible_user: root
       cm_user: root
       start_rpcbind: false
+  cephadm:
+    image: quay.ceph.io/ceph-ci/ceph:main
+    osd_method: raw
+    no_cgroups_split: true
diff --git a/docs/docker-compose/teuthology/teuthology.sh → containers/teuthology-dev/teuthology.sh b/docs/docker-compose/teuthology/teuthology.sh → containers/teuthology-dev/teuthology.sh
@@ -1,11 +1,8 @@
 #!/usr/bin/bash
 set -e
-# We don't want -x yet, in case the private key is sensitive
-if [ -n "$SSH_PRIVKEY_FILE" ]; then
-    echo "$SSH_PRIVKEY" > $HOME/.ssh/$SSH_PRIVKEY_FILE
-fi
 source /teuthology/virtualenv/bin/activate
 set -x
+cat /run/secrets/id_rsa > $HOME/.ssh/id_rsa
 if [ -n "$TESTNODES" ]; then
     for node in $(echo $TESTNODES | tr , ' '); do
         teuthology-update-inventory -m $MACHINE_TYPE $node
@@ -15,23 +12,21 @@ else
     CUSTOM_CONF=/teuthology/containerized_node.yaml
 fi
 export MACHINE_TYPE=${MACHINE_TYPE:-testnode}
-if [ -z "$TEUTHOLOGY_WAIT" ]; then
+if [ "$TEUTHOLOGY_SUITE" != "none" ]; then
     if [ -n "$TEUTH_BRANCH" ]; then
       TEUTH_BRANCH_FLAG="--teuthology-branch $TEUTH_BRANCH"
     fi
     teuthology-suite -v \
         $TEUTH_BRANCH_FLAG \
         --ceph-repo https://github.com/ceph/ceph.git \
-        --suite-repo https://github.com/ceph/ceph.git \
         -c main \
         -m $MACHINE_TYPE \
         --limit 1 \
         -n 100 \
-        --suite teuthology:no-ceph \
-        --filter-out "libcephfs,kclient,stream,centos,rhel" \
-        -d ubuntu -D 20.04 \
-        --suite-branch main \
-        --subset 9000/100000 \
+        --suite ${TEUTHOLOGY_SUITE:-teuthology:no-ceph} \
+        --suite-branch "${TEUTHOLOGY_SUITE_BRANCH}" \
+        --suite-repo "${TEUTHOLOGY_SUITE_REPO}" \
+        --filter-out "libcephfs,kclient" \
         -p 75 \
         --seed 349 \
         --force-priority \