diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 700a860766..589096065c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,12 +32,8 @@ jobs: include: - compose_version: '1.28.0' compose_path: '/usr/local/bin' - - compose_version: '1.29.2' - compose_path: '/usr/local/bin' - compose_version: 'v2.0.1' compose_path: '/usr/local/lib/docker/cli-plugins' - - compose_version: 'v2.2.3' - compose_path: '/usr/local/lib/docker/cli-plugins' steps: - name: Checkout uses: actions/checkout@v2 diff --git a/install/create-kafka-topics.sh b/install/create-kafka-topics.sh index 3ea0ce5896..a542cb54d3 100644 --- a/install/create-kafka-topics.sh +++ b/install/create-kafka-topics.sh @@ -2,7 +2,7 @@ echo "${_group}Creating additional Kafka topics ..." # NOTE: This step relies on `kafka` being available from the previous `snuba-api bootstrap` step # XXX(BYK): We cannot use auto.create.topics as Confluence and Apache hates it now (and makes it very hard to enable) -EXISTING_KAFKA_TOPICS=$($dcr --no-TTY kafka kafka-topics --list --bootstrap-server kafka:9092 2>/dev/null) +EXISTING_KAFKA_TOPICS=$($dcr kafka kafka-topics --list --bootstrap-server kafka:9092 2>/dev/null) NEEDED_KAFKA_TOPICS="ingest-attachments ingest-transactions ingest-events" for topic in $NEEDED_KAFKA_TOPICS; do if ! echo "$EXISTING_KAFKA_TOPICS" | grep -wq $topic; then diff --git a/install/relay-credentials.sh b/install/relay-credentials.sh index 392e70394a..2d62e2bf53 100644 --- a/install/relay-credentials.sh +++ b/install/relay-credentials.sh @@ -14,7 +14,7 @@ if [[ ! -f "$RELAY_CREDENTIALS_JSON" ]]; then # creating an empty credentials file before relay runs. $dcr \ - --no-deps --no-TTY \ + --no-deps \ --volume "$(pwd)/$RELAY_CONFIG_YML:/tmp/config.yml" \ relay --config /tmp credentials generate --stdout \ > "$RELAY_CREDENTIALS_JSON"