Merge pull request #8937 from cevich/quiet_v2.0_branch

Quiet v2.0 branch

.cirrus.yml

@@ -63,15 +63,6 @@ env:
     ADD_SECOND_PARTITION: 'false'  # will certainly fail inside containers
     MOD_CONTAINERS_CONF: 'true'  # Update containers.conf runtime if required by OS environment
 
-    ####
-    #### Credentials and other secret-sauces, decrypted at runtime when authorized.
-    ####
-    # Freenode IRC credentials for posting status messages
-    IRCID: ENCRYPTED[0c4a3cc4ecda08bc47cd3d31592be8ae5c2bd0151bf3def00a9afd139ef1ab23a1bd0523319d076c027f9749ddb1f3c8]
-    # Service-account client_email - needed to build images
-    SERVICE_ACCOUNT: ENCRYPTED[702a8e07e27a6faf7988fcddcc068c2ef2bb182a5aa671f5ccb7fbbfb891c823aa4a7856fb17240766845dbd68bd3f90]
-    # Service account username part of client_email - for ssh'ing into VMs
-    GCE_SSH_USERNAME: ENCRYPTED[d579f2d3000bb678c9af37c3615e92bcf3726e9afc47748c129cef23ee799faaafd4baba64048329205d162069d90060]
 
 # Default VM to use unless set or modified by task
 gce_instance:
@@ -144,191 +135,6 @@ gating_task:
     # Verify expected bash environment (-o pipefail)
     pipefail_enabledscript: 'if /bin/false | /bin/true; then echo "pipefail fault" && exit 72; fi'
 
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
-
-
-# Ensure these container images can build
-container_image_build_task:
-    alias: 'container_image_build'
-    depends_on:
-        - "gating"
-
-    # Only run for PRs, quay.io will automatically build after bramch-push
-    only_if: $CIRRUS_BRANCH != $DEST_BRANCH
-
-    matrix:
-        - name: "build in_podman image ${FEDORA_NAME} "
-          container:
-              dockerfile: Dockerfile
-        - name: "build in_podman image ${UBUNTU_NAME}"
-          container:
-              dockerfile: Dockerfile.ubuntu
-        - name: "build gate image $DEST_BRANCH branch"
-          container:
-              dockerfile: contrib/gate/Dockerfile
-
-    container:
-        dockerfile: Dockerfile
-
-    script: make install.remote
-
-
-# This task checks to make sure that we can still build an rpm from the
-# source code using contrib/rpm/podman.spec.in
-rpmbuild_task:
-
-    only_if: >-
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' &&
-        $CIRRUS_BRANCH != $DEST_BRANCH
-
-    depends_on:
-        - "gating"
-    env:
-        CIRRUS_WORKING_DIR: "/usr/src/libpod"
-
-    container:
-        image: quay.io/libpod/rpmbuild:$DEST_BRANCH
-        cpu: 2
-        memory: 4
-
-    rpmbuild_script:
-        - 'make -C ${CIRRUS_WORKING_DIR} -f ${CIRRUS_WORKING_DIR}/.copr/Makefile'
-        - 'rpmbuild --rebuild ${CIRRUS_WORKING_DIR}/podman-*.src.rpm'
-
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh |& ${TIMESTAMP}'
-
-# This task runs `make vendor` followed by ./hack/tree_status.sh to check
-# whether the git tree is clean.  The reasoning for that is to make sure
-# that the vendor.conf, the code and the vendored packages in ./vendor are
-# in sync at all times.
-vendor_task:
-
-    only_if: >-
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-
-    depends_on:
-        - "gating"
-
-    env:
-        CIRRUS_WORKING_DIR: "/var/tmp/go/src/github.com/containers/libpod"
-        GOPATH: "/var/tmp/go"
-        GOSRC: "$CIRRUS_WORKING_DIR"
-
-    # Runs within Cirrus's "community cluster"
-    container:
-        image: docker.io/library/golang:1.13
-        cpu: 4
-        memory: 12
-
-    timeout_in: 30m
-
-    vendor_script:
-        - 'cd ${CIRRUS_WORKING_DIR} && make vendor'
-        - 'cd ${CIRRUS_WORKING_DIR} && ./hack/tree_status.sh'
-
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh |& ${TIMESTAMP}'
-
-
-# This task runs `make varlink_api_generate` followed by ./hack/tree_status.sh to check
-# whether the git tree is clean.
-varlink_api_task:
-
-    only_if: >-
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-
-    depends_on:
-        - "gating"
-
-    env:
-        CIRRUS_WORKING_DIR: "/usr/src/libpod"
-        SRCPATH: "$CIRRUS_WORKING_DIR"
-        EPOCH_TEST_COMMIT: "${CIRRUS_BASE_SHA}"  # repo clone missing this data
-        # Used by tree_status.sh
-        SUGGESTION: 'remove API.md, then "make varlink_api_generate" and commit changes.'
-
-    # Runs within Cirrus's "community cluster"
-    container:
-        # Note: Image has dual purpose, see contrib/gate/README.md
-        image: "quay.io/libpod/gate:$DEST_BRANCH"
-        cpu: 4
-        memory: 12
-
-    timeout_in: 10m
-
-    api_md_script:
-        - '/usr/local/bin/entrypoint.sh BUILDTAGS="varlink" varlink_api_generate |& ${TIMESTAMP}'
-        - 'cd ${GOSRC} && ./hack/tree_status.sh |& ${TIMESTAMP}'
-
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
-
-
-build_each_commit_task:
-
-    depends_on:
-        - "gating"
-        - "vendor"
-        - "varlink_api"
-
-    only_if: >-
-        $CIRRUS_BRANCH != $DEST_BRANCH &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-
-    gce_instance:
-        cpu: 8
-        memory: "8Gb"
-
-    env:
-        MOD_CONTAINERS_CONF: 'false'
-
-    timeout_in: 30m
-
-    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
-    build_each_commit_script:
-        # set -x by default, no need to spew contents of lib.sh
-        - 'source $SCRIPT_BASE/lib.sh &> /dev/null'
-        - 'git fetch --depth 50 origin $DEST_BRANCH |& ${TIMESTAMP}'
-        - 'make build-all-new-commits GIT_BASE_BRANCH=origin/$DEST_BRANCH |& ${TIMESTAMP}'
-
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
-
-
-build_without_cgo_task:
-
-    depends_on:
-        - "gating"
-        - "vendor"
-        - "varlink_api"
-
-    only_if: >-
-        $CIRRUS_BRANCH != $DEST_BRANCH &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-
-    gce_instance:
-        cpu: 8
-        memory: "8Gb"
-
-    env:
-        MOD_CONTAINERS_CONF: 'false'
-
-    timeout_in: 30m
-
-    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
-    build_without_cgo_script:
-        - 'source $SCRIPT_BASE/lib.sh'
-        - 'make build-no-cgo'
-
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
 
 
 # Update metadata on VM images referenced by this repository state
@@ -360,317 +166,6 @@ meta_task:
     script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/update_meta.sh |& ${TIMESTAMP}'
 
 
-# This task does the unit and integration testing for every platform
-testing_task:
-
-    alias: "testing"
-    depends_on:
-        - "gating"
-        - "vendor"
-        - "varlink_api"
-        - "build_each_commit"
-        - "build_without_cgo"
-        - "container_image_build"
-
-    # Only test build cache-images, if that's what's requested
-    only_if: >-
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-
-    matrix:
-        - name: "test ${FEDORA_NAME}"
-          gce_instance:
-              image_name: "${FEDORA_CACHE_IMAGE_NAME}"
-        - name: "test ${PRIOR_FEDORA_NAME}"
-          gce_instance:
-              image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
-        - name: "test ${UBUNTU_NAME}"
-          gce_instance:
-              image_name: "${UBUNTU_CACHE_IMAGE_NAME}"
-        - name: "test ${PRIOR_UBUNTU_NAME}"
-          gce_instance:
-              image_name: "${PRIOR_UBUNTU_CACHE_IMAGE_NAME}"
-
-    timeout_in: 120m
-
-    env:
-        ADD_SECOND_PARTITION: 'true'
-        matrix:
-          - TEST_REMOTE_CLIENT: 'true'
-          - TEST_REMOTE_CLIENT: 'false'
-
-    networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh'
-    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
-    unit_test_script: '$SCRIPT_BASE/unit_test.sh |& ${TIMESTAMP}'
-    integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} integration_test'
-    system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} system_test'
-    apiv2_test_script: '$SCRIPT_BASE/apiv2_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} apiv2_test'
-
-    # When examining a particular run, provide convenient access to release files.
-    tar_artifacts:
-        path: "*.tar.gz"
-        type: "application/x-tar"
-
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
-
-    always: &standardlogs
-        package_versions_script: '$SCRIPT_BASE/logcollector.sh packages'
-        ginkgo_node_logs_script: '$SCRIPT_BASE/logcollector.sh ginkgo'
-        df_script: '$SCRIPT_BASE/logcollector.sh df'
-        audit_log_script: '$SCRIPT_BASE/logcollector.sh audit'
-        journal_script: '$SCRIPT_BASE/logcollector.sh journal'
-        varlink_script: '$SCRIPT_BASE/logcollector.sh varlink'
-        podman_system_info_script: '$SCRIPT_BASE/logcollector.sh podman'
-        html_artifacts:
-            path: "*.log.html"
-            type: "text/html"
-
-# This task executes tests under unique environments/conditions
-special_testing_rootless_task:
-
-    depends_on:
-        - "gating"
-        - "varlink_api"
-        - "vendor"
-        - "build_each_commit"
-        - "build_without_cgo"
-
-    only_if: >-
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-
-    env:
-        ADD_SECOND_PARTITION: 'true'
-        SPECIALMODE: 'rootless'  # See docs
-        matrix:
-          - TEST_REMOTE_CLIENT: 'true'
-          - TEST_REMOTE_CLIENT: 'false'
-
-    timeout_in: 60m
-
-    networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh'
-    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
-    integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} integration_test'
-    system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} system_test'
-    apiv2_test_script: '$SCRIPT_BASE/apiv2_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} apiv2_test'
-
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
-
-    always:
-        <<: *standardlogs
-
-
-special_testing_in_podman_task:
-
-    alias: "special_testing_in_podman"
-    depends_on:
-        - "gating"
-        - "varlink_api"
-        - "vendor"
-        - "build_each_commit"
-        - "build_without_cgo"
-
-    only_if: >-
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-
-    matrix:
-        - name: "in-podman ${PRIOR_FEDORA_NAME}"
-          gce_instance:
-              image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
-        - name: "in-podman ${FEDORA_NAME}"
-          gce_instance:
-              image_name: "${FEDORA_CACHE_IMAGE_NAME}"
-
-    env:
-        ADD_SECOND_PARTITION: 'true'
-        MOD_CONTAINERS_CONF: 'false'  # Use existing/native setup
-        SPECIALMODE: 'in_podman'  # See docs
-
-    timeout_in: 60m
-
-    networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh'
-    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
-    integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} integration_test'
-
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
-
-    always:
-        <<: *standardlogs
-
-
-special_testing_cross_task:
-
-    alias: "special_testing_cross"
-    depends_on:
-        - "gating"
-        - "varlink_api"
-        - "vendor"
-
-    only_if: >-
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-
-    matrix:
-        - name: 'cross-platform: windows'
-          env:
-              CROSS_PLATFORM: 'windows'
-        - name: 'cross-platform: darwin'
-          env:
-              CROSS_PLATFORM: 'darwin'
-
-    timeout_in: 20m
-
-    networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh'
-    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
-    build_release_script: '$SCRIPT_BASE/build_release.sh |& ${TIMESTAMP}'
-
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
-
-    # When examining a particular run, provide convenient access to release files.
-    zip_artifacts:
-        path: "*.zip"
-        type: "application/zip"
-
-    msi_artifacts:
-        path: "*.msi"
-        type: "application/octet-stream"
-
-
-special_testing_bindings_task:
-
-    depends_on:
-        - "gating"
-        - "varlink_api"
-        - "vendor"
-
-    only_if: >-
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-
-    env:
-        SPECIALMODE: 'bindings'  # See docs
-        ADD_SECOND_PARTITION: 'true'  # More root fs space is required
-
-    timeout_in: 40m
-
-    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
-    integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} integration_test'
-
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
-
-    always:
-        <<: *standardlogs
-
-
-special_testing_endpoint_task:
-
-    depends_on:
-        - "gating"
-        - "varlink_api"
-        - "vendor"
-
-    only_if: >-
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-
-    env:
-        SPECIALMODE: 'endpoint'  # See docs
-
-    timeout_in: 20m
-
-    setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
-    integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} | ${LOGFORMAT} integration_test'
-
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
-
-    always:
-        <<: *standardlogs
-
-
-# Test building of new cache-images for future PR testing, in this PR.
-test_build_cache_images_task:
-
-    only_if: >-
-        $CIRRUS_BRANCH != $DEST_BRANCH &&
-        $CIRRUS_CHANGE_MESSAGE =~ '.*CI:IMG.*' &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-
-    depends_on:
-        - "gating"
-        - 'container_image_build'
-
-    # VMs created by packer are not cleaned up by cirrus, must allow task to complete
-    auto_cancellation: $CI != "true"
-
-    gce_instance:
-        image_project: $GCP_PROJECT_ID
-        zone: "us-central1-a"
-        cpu: 4
-        memory: "4Gb"
-        disk: 200
-        image_name: "${IMAGE_BUILDER_CACHE_IMAGE_NAME}"
-        scopes:  # required for image building
-            - compute
-            - devstorage.full_control
-
-    networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh'
-    build_vm_images_script: '$SCRIPT_BASE/build_vm_images.sh |& ${TIMESTAMP}'
-
-    on_failure:
-        failed_df_script: '${DFCMD}'
-        failed_journalctl_b_script: 'journalctl -b || echo "Uh oh, journalctl -b failed"'
-
-
-# Test building of new cache-images for future PR testing, in this PR.
-verify_test_built_images_task:
-
-    only_if: >-
-        $CIRRUS_BRANCH != $DEST_BRANCH &&
-        $CIRRUS_CHANGE_MESSAGE =~ '.*CI:IMG.*' &&
-        $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*'
-
-
-    depends_on:
-        - "gating"
-        - "test_build_cache_images"
-
-    gce_instance:
-        # Images generated by test_build_cache_images_task (above)
-        image_name: "${PACKER_BUILDER_NAME}${BUILT_IMAGE_SUFFIX}"
-
-    env:
-        ADD_SECOND_PARTITION: 'true'
-        matrix:
-          - TEST_REMOTE_CLIENT: 'true'
-          - TEST_REMOTE_CLIENT: 'false'
-        matrix:
-            PACKER_BUILDER_NAME: "${FEDORA_NAME}"
-            PACKER_BUILDER_NAME: "${PRIOR_FEDORA_NAME}"
-            PACKER_BUILDER_NAME: "${UBUNTU_NAME}"
-            PACKER_BUILDER_NAME: "${PRIOR_UBUNTU_NAME}"
-
-    networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh'
-    installed_packages_script: '$SCRIPT_BASE/logcollector.sh packages'
-    environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
-    # Verify expectations of built images
-    check_image_script: '$SCRIPT_BASE/check_image.sh |& ${TIMESTAMP}'
-    # Note: A truncated form of normal testing. It only needs to confirm new images
-    # "probably" work.  A full round of testing will happen again after $*_CACHE_IMAGE_NAME
-    # are updated in this or another PR (w/o '***CIRRUS: TEST IMAGES***').
-    integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}'
-    system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}'
-
-    always:
-        <<: *standardlogs
-
-
 docs_task:
 
     # Don't run this when building/testing new VM images
@@ -678,14 +173,9 @@ docs_task:
 
     depends_on:
         - "gating"
-    env:
-        RELEASE_GCPJSON: ENCRYPTED[927dc01e755eaddb4242b0845cf86c9098d1e3dffac38c70aefb1487fd8b4fe6dd6ae627b3bffafaba70e2c63172664e]
-        RELEASE_GCPNAME: ENCRYPTED[c145e9c16b6fb88d476944a454bf4c1ccc84bb4ecaca73bdd28bdacef0dfa7959ebc8171a27b2e4064d66093b2cdba49]
-        RELEASE_GCPROJECT: $GCP_PROJECT_ID
 
     script:
         - "$SCRIPT_BASE/build_swagger.sh |& ${TIMESTAMP}"
-        - "$SCRIPT_BASE/upload_release_archive.sh |& ${TIMESTAMP}"
 
 
 # Post message to IRC if everything passed PR testing
@@ -698,23 +188,8 @@ success_task:
     # ignores any dependent task conditions
     depends_on:
         - "gating"
-        - "vendor"
-        - "varlink_api"
-        - "build_each_commit"
-        - "build_without_cgo"
-        - "container_image_build"
         - "meta"
-        - "testing"
-        - "rpmbuild"
-        - "special_testing_rootless"
-        - "special_testing_in_podman"
-        - "special_testing_cross"
-        - "special_testing_endpoint"
-        - "special_testing_bindings"
-        - "test_build_cache_images"
-        - "verify_test_built_images"
         - "docs"
-        - "static_build"
 
     env:
         CIRRUS_WORKING_DIR: "/usr/src/libpod"
@@ -727,19 +202,4 @@ success_task:
         cpu: 1
         memory: 1
 
-    success_script: '/usr/local/bin/entrypoint.sh ./$SCRIPT_BASE/success.sh |& ${TIMESTAMP}'
+    success_script: /bin/true
-
-static_build_task:
-    container:
-        image: quay.io/podman/nix-podman:1.0.0
-        cpu: 8
-        memory: 12
-    timeout_in: 20m
-    depends_on:
-        - "gating"
-    build_script:
-        - nix build -f nix
-    binaries_artifacts:
-        path: "result-bin/bin/podman"
-    on_failure:
-        failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh |& ${TIMESTAMP}'

contrib/cirrus/git_authors_to_irc_nicks.csv

@@ -1,12 +0,0 @@
-# Comma separated mapping of author e-mail, to Freenode IRC nick.
-# When no match is found here, the username portion of the e-mail is used.
-# Sorting is done at runtime - first-found e-mail match wins.
-# Comments (like this) and blank lines are ignored.
-
-bbaude@redhat.com,baude
-matthew.heon@pm.me,mheon
-matthew.heon@gmail.com,mheon
-emilien@redhat.com,EmilienM
-rothberg@redhat.com,vrothberg
-santiago@redhat.com,edsantiago
-gscrivan@redhat.com,giuseppe

contrib/cirrus/lib.sh

@@ -38,7 +38,6 @@ SCRIPT_BASE=${SCRIPT_BASE:-./contrib/cirrus}
 PACKER_BASE=${PACKER_BASE:-./contrib/cirrus/packer}
 # Important filepaths
 SETUP_MARKER_FILEPATH="${SETUP_MARKER_FILEPATH:-/var/tmp/.setup_environment_sh_complete}"
-AUTHOR_NICKS_FILEPATH="${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/git_authors_to_irc_nicks.csv"
 # Downloaded, but not installed packages.
 PACKAGE_DOWNLOAD_DIR=/var/cache/download
 
@@ -98,7 +97,7 @@ BIGTO="timeout_attempt_delay_command 300s 5 60s"
 # Safe env. vars. to transfer from root -> $ROOTLESS_USER  (go env handled separately)
 ROOTLESS_ENV_RE='(CIRRUS_.+)|(ROOTLESS_.+)|(.+_IMAGE.*)|(.+_BASE)|(.*DIRPATH)|(.*FILEPATH)|(SOURCE.*)|(DEPEND.*)|(.+_DEPS_.+)|(OS_REL.*)|(.+_ENV_RE)|(TRAVIS)|(CI.+)|(TEST_REMOTE.*)'
 # Unsafe env. vars for display
-SECRET_ENV_RE='(IRCID)|(ACCOUNT)|(GC[EP]..+)|(SSH)'
+SECRET_ENV_RE='(ACCOUNT)|(GC[EP]..+)|(SSH)'
 
 SPECIALMODE="${SPECIALMODE:-none}"
 TEST_REMOTE_CLIENT="${TEST_REMOTE_CLIENT:-false}"
@@ -237,19 +236,6 @@ timeout_attempt_delay_command() {
     fi
 }
 
-ircmsg() {
-    req_env_var CIRRUS_TASK_ID IRCID
-    [[ -n "$*" ]] || die 9 "ircmsg() invoked without message text argument"
-    # 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
-    $SCRIPT $NICK $@
-    echo "Ignoring exit($?)"
-    set -e
-}
-
 # This covers all possible human & CI workflow parallel & serial combinations
 # where at least one caller must definitively discover if within a commit range
 # there is at least one release tag not having any '-' characters (return 0)

contrib/cirrus/notice_branch_failure.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source $(dirname $0)/lib.sh
-
-# mIRC "escape" codes are the most standard, for a non-standard client-side interpretation.
-ETX="$(echo -n -e '\x03')"
-RED="${ETX}4"
-NOR="$(echo -n -e '\x0f')"
-
-if [[ "$CIRRUS_BRANCH" = "$DEST_BRANCH" ]]
-then
-    BURL="https://cirrus-ci.com/build/$CIRRUS_BUILD_ID"
-    ircmsg "${RED}[Action Recommended]: ${NOR}Post-merge testing on ${RED}$CIRRUS_BRANCH failed${NOR} in $CIRRUS_TASK_NAME on ${OS_RELEASE_ID}-${OS_RELEASE_VER}: $BURL.  Please investigate, and re-run if appropriate."
-fi
-
-# This script assumed to be executed on failure
-die 1 "Testing Failed"

contrib/cirrus/podbot.py

@@ -1,105 +0,0 @@
-#!/usr/bin/env python3
-
-# Simple and dumb script to send a message to the #podman IRC channel on frenode
-# Based on example from: https://pythonspot.com/building-an-irc-bot/
-
-import os
-import time
-import random
-import errno
-import socket
-import sys
-
-class IRC:
-
-    response_timeout = 30  # seconds
-    irc = socket.socket()
-
-    def __init__(self, server, nickname, channel):
-        self.server = server
-        self.nickname = nickname
-        self.channel = channel
-        self.irc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-
-    def _send(self, cmdstr):
-        self.irc.send(bytes(cmdstr + '\r\n', 'utf-8'))
-
-    def message(self, msg):
-        data = 'PRIVMSG {0} :{1}\r\n'.format(self.channel, msg)
-        print(data)
-        self._send(data)
-
-    @staticmethod
-    def fix_newlines(bufr):
-        return bufr.replace('\\r\\n', '\n')
-
-    def _required_response(self, needle, haystack):
-        start = time.time()
-        end = start + self.response_timeout
-        while time.time() < end:
-            if haystack.find(needle) != -1:
-                return (False, haystack)
-            time.sleep(0.1)
-            try:
-                haystack += str(self.irc.recv(4096, socket.MSG_DONTWAIT))
-            except socket.error as serr:
-                if serr.errno == errno.EWOULDBLOCK:
-                    continue
-                raise  # can't handle this
-        return (True, haystack)  # Error
-
-    def connect(self, username, password):
-        # This is ugly as sin, but seems to be a working send/expect sequence
-
-        print("connecting to: {0}".format(self.server))
-        self.irc.connect((self.server, 6667))  #connects to the server
-        self._send("USER {0} {0} {0} :I am {0}".format(self.nickname))
-        self._send("NICK {0}".format(self.nickname))
-
-        err, haystack = self._required_response('End of /MOTD command.'
-                                                ''.format(self.nickname), "")
-        if err:
-            print(self.fix_newlines(haystack))
-            print("Error connecting to {0}".format(self.server))
-            return True
-
-        print("Logging in as {0}".format(username))
-        self._send("PRIVMSG NickServ :IDENTIFY {0} {1}".format(username, password))
-        err, _ = self._required_response("You are now identified for", "")
-        if err:
-            print("Error logging in to {0} as {1}".format(self.server, username))
-            return True
-
-        print("Joining {0}".format(self.channel))
-        self._send("JOIN {0}".format(self.channel))
-        err, haystack = self._required_response("{0} {1} :End of /NAMES list."
-                                                "".format(self.nickname, self.channel),
-                                                haystack)
-        print(self.fix_newlines(haystack))
-        if err:
-            print("Error joining {0}".format(self.channel))
-            return True
-        return False
-
-    def quit(self):
-        print("Quitting")
-        self._send("QUIT :my work is done here")
-        self.irc.close()
-
-
-if len(sys.argv) < 3:
-    print("Error: Must pass desired nick and message as parameters")
-else:
-    for try_again in (True,False):
-        irc = IRC("irc.freenode.net", sys.argv[1], "#podman")
-        err = irc.connect(*os.environ.get('IRCID', 'Big Bug').split(" ", 2))
-        if err and try_again:
-            print("Trying again in 5 seconds...")
-            time.sleep(5)
-            continue
-        elif err:
-            break
-        irc.message(" ".join(sys.argv[2:]))
-        time.sleep(5.0)  # avoid join/quit spam
-        irc.quit()
-        break

contrib/cirrus/success.sh

@@ -1,66 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source $(dirname $0)/lib.sh
-
-req_env_var CIRRUS_BRANCH CIRRUS_REPO_FULL_NAME CIRRUS_BASE_SHA CIRRUS_CHANGE_IN_REPO CIRRUS_CHANGE_MESSAGE
-
-cd $CIRRUS_WORKING_DIR
-
-if [[ "$CIRRUS_BRANCH" =~ "pull" ]]
-then
-    echo "Retrieving latest HEADS and tags"
-    git fetch --all --tags
-    echo "Finding commit authors for PR $CIRRUS_PR"
-    unset NICKS
-    if [[ -r "$AUTHOR_NICKS_FILEPATH" ]]
-    then
-        SHARANGE="${CIRRUS_BASE_SHA}..${CIRRUS_CHANGE_IN_REPO}"
-        EXCLUDE_RE='merge-robot'
-        EMAILCSET='[:alnum:]-+_@.'
-        AUTHOR_NICKS=$(egrep -v '(^[[:space:]]*$)|(^[[:space:]]*#)' "$AUTHOR_NICKS_FILEPATH" | sort -u)
-        # Depending on branch-state, it's possible SHARANGE could be _WAY_ too big
-        MAX_NICKS=10
-        # newline separated
-        GITLOG="git log --format='%ae'"
-        COMMIT_AUTHORS=$($GITLOG $SHARANGE || $GITLOG -1 HEAD | \
-                         tr --delete --complement "$EMAILCSET[:space:]" | \
-                         egrep -v "$EXCLUDE_RE" | \
-                         sort -u | \
-                         tail -$MAX_NICKS)
-
-        for c_email in $COMMIT_AUTHORS
-        do
-            c_email=$(echo "$c_email" | tr --delete --complement "$EMAILCSET")
-            echo -e "\tExamining $c_email"
-            NICK=$(echo "$AUTHOR_NICKS" | grep -m 1 "$c_email" | \
-                   awk --field-separator ',' '{print $2}' | tr -d '[[:blank:]]')
-            if [[ -n "$NICK" ]]
-            then
-                echo -e "\t\tFound $c_email -> $NICK in $(basename $AUTHOR_NICKS_FILEPATH)"
-            else
-                echo -e "\t\tNot found in $(basename $AUTHOR_NICKS_FILEPATH), using e-mail username."
-                NICK=$(echo "$c_email" | cut -d '@' -f 1)
-            fi
-            if ! echo "$NICKS" | grep -q "$NICK"
-            then
-                echo -e "\tUsing nick $NICK"
-                NICKS="${NICKS:+$NICKS, }$NICK"
-            else
-                echo -e "\tNot re-adding duplicate nick $NICK"
-            fi
-        done
-    fi
-
-    unset MENTION_PREFIX
-    [[ -z "$NICKS" ]] || \
-        MENTION_PREFIX="$NICKS: "
-
-    URL="https://github.com/$CIRRUS_REPO_FULL_NAME/pull/$CIRRUS_PR"
-    PR_SUBJECT=$(echo "$CIRRUS_CHANGE_MESSAGE" | head -1)
-    ircmsg "${MENTION_PREFIX}Cirrus-CI testing successful for PR '$PR_SUBJECT': $URL"
-else
-    URL="https://cirrus-ci.com/github/containers/libpod/$CIRRUS_BRANCH"
-    ircmsg "Cirrus-CI testing branch $(basename $CIRRUS_BRANCH) successful: $URL"
-fi