Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions .buildkite/ci-checkov.sh

This file was deleted.

11 changes: 1 addition & 10 deletions .buildkite/pipeline.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$schema: "http://json.schemastore.org/buildkite"
env:
# Build this image in sourcegraph/infrastructure by running `make e2e` in `gcp/images`
# GCP VM image for the Vagrant smoke test. Build it in sourcegraph/infrastructure by running `make e2e` in `gcp/images`
IMAGE: "e2e-db8a40720-2024-08-26t08-44-10z"
VAGRANT_RUN_ENV: "CI"
steps:
Expand All @@ -19,17 +19,8 @@ steps:
- label: ":rice: docker-compose-test"
command: .buildkite/vagrant-run.sh docker-test
artifact_paths: ./*.log
env:
TEST_TYPE: "docker-compose-test"
agents: { queue: "vagrant" }

# This runs the Checkov Terraform Code scanner
# https://www.checkov.io/
- command: .buildkite/ci-checkov.sh
label: ":lock: security - checkov"
agents: { queue: "standard" }
soft_fail: true

# Please keep in mind that the release manifest uses specific branch names when creating releases.
# Therefore, if you update them, or if you decide to change how we detect what kind of build we're dealing
# with, please update this file as well.
Expand Down
8 changes: 2 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
.env
.envrc

node_modules/

.vagrant
*.log
/.env

/right.dhall
node_modules/
1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

2 changes: 0 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
nodejs 16.7.0
yarn 1.22.4
shellcheck 0.7.1
golang 1.19.8
github-cli 2.46.0
asdf:bosmak/asdf-checkov latest
1 change: 0 additions & 1 deletion test/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
#!/usr/bin/env bash
cat << EOF >> /root/.profile
export GIT_BRANCH=#{ENV['BUILDKITE_BRANCH']}
export TEST_TYPE=#{ENV['TEST_TYPE']}
export DOCKER_USERNAME=#{ENV['DOCKER_USERNAME']}
export DOCKER_PASSWORD=#{ENV['DOCKER_PASSWORD']}
EOF
Expand Down
8 changes: 3 additions & 5 deletions test/smoke-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,11 @@ configure_docker() {
gcloud auth configure-docker us-central1-docker.pkg.dev,us-docker.pkg.dev
}

expect_containers="25"

deploy_sourcegraph() {
cd $(dirname "${BASH_SOURCE[0]}")/..
#Deploy sourcegraph
if [[ "$TEST_TYPE" == "docker-compose-test" ]]; then
docker-compose --file docker-compose/docker-compose.yaml up -d -t 600
expect_containers="25"
fi
docker-compose --file docker-compose/docker-compose.yaml up -d -t 600

echo "Giving containers 90s to start..."
sleep 90
Expand Down
Loading