Fix deprecate_test
The test often fails with error
```
deprecating images failed: googleapi: Error 409: Resource ... has an ongoing conflicting operation
```
This happens because deprecate_test, image_test and gce_test use
the same test image family. When these 3 tests run at the same time,
deprecate_test sometimes tries to set the deprecate label to an
already deleted image (from either of the other two tests) in the
same image family, which results in the error.
This change just uses a different test image family for
deprecate_test.
BUG=b/379737616,b/367382748
TEST=presubmit and deprecate_test https://pantheon.corp.google.com/cloud-build/builds/dcc0defd-594b-4951-a192-d5807fa515cd?e=13803378&mods=allow_workbench_image_override&project=google.com:cloud-image-docker-builder
RELEASE_NOTE=None
Change-Id: If8b3afffb4ba536df42ab0ac2140085efb253bea
Reviewed-on: https://cos-review.googlesource.com/c/cos/tools/+/88999
Reviewed-by: Kevin Berry <kpberry@google.com>
Tested-by: Nandhini Rengaraj <nrengaraj@google.com>
Cloud-Build: GCB Service account <228075978874@cloudbuild.gserviceaccount.com>
diff --git a/testing/deprecate_test.yaml b/testing/deprecate_test.yaml
index 27a3ac2..d3b1efd 100644
--- a/testing/deprecate_test.yaml
+++ b/testing/deprecate_test.yaml
@@ -22,7 +22,7 @@
- name: 'gcr.io/cloud-builders/gcloud'
args: ['compute', 'images', 'create', 'preload-test-$BUILD_ID-old',
'--source-image=${_INPUT_IMAGE}', '--source-image-project=${_INPUT_PROJECT}',
- '--family=test-family']
+ '--family=deprecate-test-family']
- name: 'cos_customizer'
args: ['start-image-build',
'-build-context=testing/${_TEST}',
@@ -35,7 +35,7 @@
'-zone=us-west1-b',
'-project=$PROJECT_ID',
'-image-name=preload-test-$BUILD_ID',
- '-image-family=test-family',
+ '-image-family=deprecate-test-family',
'-deprecate-old-images',
'-image-project=$PROJECT_ID',
'-service-account=compute@cloud-image-docker-builder.google.com.iam.gserviceaccount.com']