Clean up

Author: avilevy18

Dockerfile

@@ -21,8 +21,7 @@ COPY go.mod go.sum ./
 RUN go mod download
 
 COPY . .
-RUN set -x; if [ "$BUILD_TAGS" = "e2ecollector" ]; then BUILD_DIRECTORY="e2etestrunner-collector"; fi; CGO_ENABLED=0 go test -timeout 3600s -tags=$BUILD_TAGS -c "./$BUILD_DIRECTORY" -o opentelemetry-operations-e2e-testing.test
-#RUN CGO_ENABLED=0 go test -tags=e2ecollector -c ./e2etestrunner-collector -o opentelemetry-operations-e2e-testing.test
+RUN set -x; if [ "$BUILD_TAGS" = "e2ecollector" ]; then BUILD_DIRECTORY="e2etestrunner-collector"; else BUILD_TAGS="e2e"; BUILD_DIRECTORY="e2etestrunner"; fi; CGO_ENABLED=0 go test -timeout 3600s -tags=$BUILD_TAGS -c "./$BUILD_DIRECTORY" -o opentelemetry-operations-e2e-testing.test
 
 FROM hashicorp/terraform:light as tfbuild
 COPY tf /src/tf

Makefile

@@ -1,10 +1,34 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Builds a docker image, tagging it as _DOCKER_TAG (substitution must be
+# provided) and latest.
+
 steps:
-- name: ${E2E_PROJECT}
-  env: ["PROJECT_ID=$PROJECT_ID"]
-  dir: /
+- name: docker
+  env:
+  - DOCKER_BUILDKIT=1
   args:
-  - gke-collector
-  - --image=${COLLECTOR_PROJECT}
+  - build
+  - --tag=${_TEST_RUNNER_IMAGE_NAME}:${_DOCKER_TAG}
+  - --tag=${_TEST_RUNNER_IMAGE_NAME}:latest
+  - --build-arg=BUILDKIT_INLINE_CACHE=1
+  - --cache-from=${_TEST_RUNNER_IMAGE_NAME}:latest
+  - .
+
+images: ["${_TEST_RUNNER_IMAGE_NAME}"]
+options:
+  dynamic_substitutions: true
 substitutions:
-  E2E_PROJECT: ''
-  COLLECTOR_PROJECT: ''
+  _TEST_RUNNER_IMAGE_NAME: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing

cloudbuild-collector.yaml

@@ -71,10 +71,6 @@ module "otel_config" {
   test_run_id = terraform.workspace
 }
 
-locals {
-  config_path = "/etc/otelcol-contrib/config.yaml"
-}
-
 variable "image" {
   type = string
 }