@@ -57,22 +57,22 @@ resource "google_cloudbuild_trigger" "preloader_trigger" {
57
57
id = " bearer_token"
58
58
name = " gcr.io/cloud-builders/gcloud"
59
59
script = << EOT
60
- gcloud auth print-access-token --lifetime=4200 > /workspace/cb_access
60
+ gcloud auth print-access-token > /workspace/cb_access
61
61
curl -H "Metadata-Flavor: Google" "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/${ local . cloudbuild_service_account } /identity?audience=${ var . submission_url } " > /workspace/cb_identity
62
62
EOT
63
63
}
64
64
65
65
# # TODO(phboneff): move to its own container / cloudrun / batch job.
66
66
# # Preload entries.
67
67
# # Leave enough time for the preloader to run, until the token expires.
68
- # # Stop after 40k entries, this is what gets copied within 60 minutes.
68
+ # # Stop after 360k entries, this is what gets copied within 60 minutes.
69
69
timeout = " 4200s" // 60 minutes
70
70
step {
71
71
id = " ct_preloader"
72
72
name = " golang"
73
73
script = << EOT
74
74
START_INDEX=$(curl -H "Authorization: Bearer $(cat /workspace/cb_access)" ${ var . monitoring_url } /checkpoint | head -2 | tail -1)
75
- END_INDEX=$(($START_INDEX+400000 ))
75
+ END_INDEX=$(($START_INDEX+360000 ))
76
76
echo "Will run preloader between $START_INDEX and $END_INDEX"
77
77
go run github.com/google/certificate-transparency-go/preload/preloader@master \
78
78
--target_log_uri=${ var . submission_url } / \
@@ -85,7 +85,7 @@ resource "google_cloudbuild_trigger" "preloader_trigger" {
85
85
--parallel_submit=20
86
86
EOT
87
87
wait_for = [" bearer_token" ]
88
- timeout = " 3600s " // 60 minutes, duration of token validity.
88
+ timeout = " 3420s " // 57 minutes, since token validity if of 60 min .
89
89
}
90
90
91
91
options {
@@ -112,7 +112,7 @@ resource "google_cloud_scheduler_job" "deploy_cron" {
112
112
uri = " https://cloudbuild.googleapis.com/v1/projects/${ var . project_id } /locations/${ var . location } /triggers/${ google_cloudbuild_trigger . preloader_trigger . trigger_id } :run"
113
113
body = base64encode (jsonencode ({
114
114
source = {
115
- branchName = " preloader "
115
+ branchName = " main "
116
116
}
117
117
}))
118
118
headers = {
0 commit comments