6 files changed, 17 insertions, 12 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 51db203fd..3b567b7a7 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -123,12 +123,11 @@ stub() {
 
 ircmsg() {
     req_env_var "
-        SCRIPT_BASE $SCRIPT_BASE
-        GOSRC $GOSRC
         CIRRUS_TASK_ID $CIRRUS_TASK_ID
         1 $1
     "
-    SCRIPT="$GOSRC/$SCRIPT_BASE/podbot.py"
+    # Sometimes setup_environment.sh didn't run
+    SCRIPT="$(dirname $0)/podbot.py"
     NICK="podbot_$CIRRUS_TASK_ID"
     NICK="${NICK:0:15}"  # Any longer will break things
     set +e
diff --git a/contrib/cirrus/packer/centos_setup.sh b/contrib/cirrus/packer/centos_setup.sh
index 7b2308739..a13050569 100644
--- a/contrib/cirrus/packer/centos_setup.sh
+++ b/contrib/cirrus/packer/centos_setup.sh
@@ -29,6 +29,7 @@ ooe.sh sudo yum -y install \
     btrfs-progs-devel \
     bzip2 \
     device-mapper-devel \
+    emacs-nox \
     findutils \
     glib2-devel \
     glibc-static \
@@ -63,6 +64,7 @@ ooe.sh sudo yum -y install \
     runc \
     skopeo-containers \
     unzip \
+    vim \
     which \
     xz
 
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh
index a14e1b01f..01c468901 100644
--- a/contrib/cirrus/packer/fedora_setup.sh
+++ b/contrib/cirrus/packer/fedora_setup.sh
@@ -29,6 +29,7 @@ ooe.sh sudo dnf install -y \
     btrfs-progs-devel \
     bzip2 \
     device-mapper-devel \
+    emacs-nox \
     findutils \
     git \
     glib2-devel \
@@ -66,6 +67,7 @@ ooe.sh sudo dnf install -y \
     skopeo-containers \
     slirp4netns \
     unzip \
+    vim \
     which \
     xz
 
diff --git a/contrib/cirrus/packer/rhel_setup.sh b/contrib/cirrus/packer/rhel_setup.sh
index 7f0d4e589..99376fd65 100644
--- a/contrib/cirrus/packer/rhel_setup.sh
+++ b/contrib/cirrus/packer/rhel_setup.sh
@@ -35,6 +35,7 @@ ooe.sh sudo yum -y install \
     btrfs-progs-devel \
     bzip2 \
     device-mapper-devel \
+    emacs-nox \
     findutils \
     glib2-devel \
     glibc-static \
@@ -69,6 +70,7 @@ ooe.sh sudo yum -y install \
     runc \
     skopeo-containers \
     unzip \
+    vim \
     which \
     xz
 
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 6e3613462..af5671c90 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -37,6 +37,7 @@ ooe.sh sudo -E apt-get -qq install --no-install-recommends \
     build-essential \
     curl \
     e2fslibs-dev \
+    emacs-nox \
     gawk \
     gettext \
     go-md2man \
@@ -76,6 +77,7 @@ ooe.sh sudo -E apt-get -qq install --no-install-recommends \
     python3-setuptools \
     socat \
     unzip \
+    vim \
     xz-utils
 
 echo "Fixing Ubuntu kernel not enabling swap accounting by default"
diff --git a/contrib/cirrus/success.sh b/contrib/cirrus/success.sh
index d1daf9043..2b0cf4655 100755
--- a/contrib/cirrus/success.sh
+++ b/contrib/cirrus/success.sh
@@ -1,22 +1,20 @@
 #!/bin/bash
 
 set -e
+
 source $(dirname $0)/lib.sh
 
 req_env_var "
-    CIRRUS_TASK_NAME $CIRRUS_TASK_NAME
     CIRRUS_BRANCH $CIRRUS_BRANCH
-    OS_RELEASE_ID $OS_RELEASE_ID
-    OS_RELEASE_VER $OS_RELEASE_VER
-    CIRRUS_REPO_CLONE_URL $CIRRUS_REPO_CLONE_URL
+    CIRRUS_BUILD_ID $CIRRUS_BUILD_ID
 "
 
-REF_URL="$(echo $CIRRUS_REPO_CLONE_URL | sed 's/.git$//g')"
+REF=$(basename $CIRRUS_BRANCH)  # PR number or branch named
+URL="https://cirrus-ci.com/build/$CIRRUS_BUILD_ID"
+
 if [[ "$CIRRUS_BRANCH" =~ "pull" ]]
 then
-    REF_URL="$REF_URL/$CIRRUS_BRANCH"  # pull request URL
+    ircmsg "Cirrus-CI testing successful for PR #$REF: $URL"
 else
-    REF_URL="$REF_URL/commits/$CIRRUS_BRANCH"  # branch merge
+    ircmsg "Cirrus-CI testing branch $REF successful: $URL"
 fi
-
-ircmsg "Cirrus-CI $CIRRUS_TASK_NAME on $OS_RELEASE_ID-$OS_RELEASE_VER successful for $REF_URL"