Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package google-osconfig-agent for openSUSE:Factory checked in at 2024-10-23 21:09:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/google-osconfig-agent (Old) and /work/SRC/openSUSE:Factory/.google-osconfig-agent.new.26871 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "google-osconfig-agent" Wed Oct 23 21:09:42 2024 rev:33 rq:1217038 version:20241017.00 Changes: -------- --- /work/SRC/openSUSE:Factory/google-osconfig-agent/google-osconfig-agent.changes 2024-10-07 21:53:07.232474171 +0200 +++ /work/SRC/openSUSE:Factory/.google-osconfig-agent.new.26871/google-osconfig-agent.changes 2024-10-23 21:10:50.548102974 +0200 @@ -1,0 +2,9 @@ +Tue Oct 22 08:06:48 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com> + +- Update to version 20241017.00 (bsc#1231775, bsc#1231776) + * Add a new CloudBuild trigger config-file for auto updating the + presubmit test container image on every new commit (#704) +- from version 20241004.00 + * Add new packagebuild presubmit that will use cloud-build (#694) + +------------------------------------------------------------------- Old: ---- osconfig-20240927.00.tar.gz New: ---- osconfig-20241017.00.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ google-osconfig-agent.spec ++++++ --- /var/tmp/diff_new_pack.1yUzpx/_old 2024-10-23 21:10:51.388138039 +0200 +++ /var/tmp/diff_new_pack.1yUzpx/_new 2024-10-23 21:10:51.392138206 +0200 @@ -24,7 +24,7 @@ %global import_path %{provider_prefix} Name: google-osconfig-agent -Version: 20240927.00 +Version: 20241017.00 Release: 0 Summary: Google Cloud Guest Agent License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.1yUzpx/_old 2024-10-23 21:10:51.424139542 +0200 +++ /var/tmp/diff_new_pack.1yUzpx/_new 2024-10-23 21:10:51.428139709 +0200 @@ -3,8 +3,8 @@ <param name="url">https://github.com/GoogleCloudPlatform/osconfig</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="versionformat">20240927.00</param> - <param name="revision">20240927.00</param> + <param name="versionformat">20241017.00</param> + <param name="revision">20241017.00</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> @@ -15,7 +15,7 @@ <param name="basename">osconfig</param> </service> <service name="go_modules" mode="disabled"> - <param name="archive">osconfig-20240927.00.tar.gz</param> + <param name="archive">osconfig-20241017.00.tar.gz</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.1yUzpx/_old 2024-10-23 21:10:51.448140544 +0200 +++ /var/tmp/diff_new_pack.1yUzpx/_new 2024-10-23 21:10:51.456140878 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/GoogleCloudPlatform/osconfig</param> - <param name="changesrevision">54192dd5ce4d962a6ae08dfac8479a371db3951b</param></service></servicedata> + <param name="changesrevision">207d00c00a9ee872ec7220086119e6aaaebc9500</param></service></servicedata> (No newline at EOF) ++++++ osconfig-20240927.00.tar.gz -> osconfig-20241017.00.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osconfig-20240927.00/presubmit_packagebuild/Dockerfile new/osconfig-20241017.00/presubmit_packagebuild/Dockerfile --- old/osconfig-20240927.00/presubmit_packagebuild/Dockerfile 2024-09-27 16:08:37.000000000 +0200 +++ new/osconfig-20241017.00/presubmit_packagebuild/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -# Copyright 2018 Google Inc. All Rights Reserved. -# -# 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. -FROM gcr.io/compute-image-tools/daisy:latest - -#FROM alpine -# Needed for gsutil. -FROM google/cloud-sdk:alpine - -RUN apk add --no-cache bash - -WORKDIR / -COPY --from=0 /daisy daisy -# Daisy image copies this from gcr.io/distroless/base, we copy here. -COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt - -# Must be built from root of repo, where packagebuild dir is. -COPY packagebuild packagebuild -# Copy this Dockerfile for debugging. -COPY container_images/daisy-builder/Dockerfile Dockerfile -COPY container_images/daisy-builder/main.sh main.sh - -ENTRYPOINT ["/main.sh"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osconfig-20240927.00/presubmit_packagebuild/docker-image/Dockerfile new/osconfig-20241017.00/presubmit_packagebuild/docker-image/Dockerfile --- old/osconfig-20240927.00/presubmit_packagebuild/docker-image/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/osconfig-20241017.00/presubmit_packagebuild/docker-image/Dockerfile 2024-10-17 11:18:19.000000000 +0200 @@ -0,0 +1,33 @@ +# Copyright 2018 Google Inc. All Rights Reserved. +# +# 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. +FROM gcr.io/compute-image-tools/daisy:latest + +#FROM alpine +# Needed for gsutil. +FROM google/cloud-sdk:alpine + +RUN apk add --no-cache bash + +WORKDIR / +COPY --from=0 /daisy daisy +# Daisy image copies this from gcr.io/distroless/base, we copy here. +COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt + +# Must be built from root of repo, where packagebuild dir is. +COPY packagebuild packagebuild +# Copy this Dockerfile for debugging. +COPY presubmit_packagebuild/docker-image/Dockerfile Dockerfile +COPY presubmit_packagebuild/docker-image/main.sh main.sh + +ENTRYPOINT ["/main.sh"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osconfig-20240927.00/presubmit_packagebuild/docker-image/build-container-img-cloudbuild.yaml new/osconfig-20241017.00/presubmit_packagebuild/docker-image/build-container-img-cloudbuild.yaml --- old/osconfig-20240927.00/presubmit_packagebuild/docker-image/build-container-img-cloudbuild.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/osconfig-20241017.00/presubmit_packagebuild/docker-image/build-container-img-cloudbuild.yaml 2024-10-17 11:18:19.000000000 +0200 @@ -0,0 +1,11 @@ +timeout: 5400s + +steps: +- name: 'gcr.io/kaniko-project/executor:v1.23.2' + args: + - --destination=europe-docker.pkg.dev/osconfig-agent-presubmits/osconfig-package-build-presubmit/osconfig-package-build-presubmit:latest + - --context=/workspace + - --dockerfile=presubmit_packagebuild/docker-image/Dockerfile + +options: + defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osconfig-20240927.00/presubmit_packagebuild/docker-image/main.sh new/osconfig-20241017.00/presubmit_packagebuild/docker-image/main.sh --- old/osconfig-20240927.00/presubmit_packagebuild/docker-image/main.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/osconfig-20241017.00/presubmit_packagebuild/docker-image/main.sh 2024-10-17 11:18:19.000000000 +0200 @@ -0,0 +1,131 @@ +#!/bin/bash +# Copyright 2019 Google Inc. All Rights Reserved. +# +# 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. + +PROJECT="$1" +ZONE="$2" +DISTROS="$3" # Distros to build +GCS_OUTPUT_BUCKET="$4" # Destination for artifacts +BUILD_DIR="$5" # Directory to build from +VERSION="" + +# Workflow consisting entirely of separate IncludeWorkflow steps referencing +# build_${distro}.wf.json, which should be checked out from guest-test-infra. +function generate_build_workflow() { + local WF="$1" + + config='{ + "Name": "build-packages", + "DefaultTimeout": "30m", + "Vars": { + "gcs_path": { + "Value": "${SCRATCHPATH}/packages", + "Description": "GCS path for built packages e.g. gs://my-bucket/packages" + }, + "repo_owner": { + "Value": "GoogleCloudPlatform", + "Description": "GitHub repo owner or organization" + }, + "repo_name": { + "Description": "Github repo name", + "Required": true + }, + "git_ref": { + "Value": "master", + "Description": "Git ref to check out and build" + }, + "version": { + "Description": "Version to build" + }, + "build_dir": { + "Description": "Directory to build from" + } + }, + "Steps": {' + + for distro in ${DISTROS//,/ }; do + distrodash=$(echo "$distro" | tr '_' '-') + if [[ "$config" =~ IncludeWorkflow ]]; then + # Append additional steps + config="${config}," + fi + config="${config}\n"' "'"$distrodash"'": { + "IncludeWorkflow": { + "Path": "./workflows/build_'"$distro"'.wf.json", + "Vars": { + "gcs_path": "${gcs_path}", + "repo_owner": "${repo_owner}", + "repo_name": "${repo_name}", + "git_ref": "${git_ref}", + "build_dir": "${build_dir}", + "version": "${version}" + } + } + }' + done + + config="$config"' + } +}' + echo -e "$config" > "$WF" +} + +# Sets service account used for daisy and gsutil commands below. Will use +# default service account for VM or k8s node if not set. +if [[ -n $GOOGLE_APPLICATION_CREDENTIALS ]]; then + gcloud auth activate-service-account --key-file=$GOOGLE_APPLICATION_CREDENTIALS +fi + +cd /packagebuild + +WF="build.wf.json" +generate_build_workflow "$WF" +echo "Generated workflow:" +cat "$WF" + +## Some vars such as REPO_OWNER and PULL_NUMBER are set by prow +DAISY_VARS="repo_owner=${REPO_OWNER},repo_name=${REPO_NAME}" + +## only add pull reference in case of presubmit jobs +if [[ "$JOB_TYPE" == "presubmit" ]]; then + DAISY_VARS+=",git_ref=pull/${PULL_NUMBER}/head" +else + DAISY_VARS+=",git_ref=${PULL_BASE_REF}" +fi + +## Build from subdir if requested +if [[ -n "$BUILD_DIR" ]]; then + DAISY_VARS+=",build_dir=${BUILD_DIR}" +fi + +DAISY_CMD="/daisy -project ${PROJECT} -zone ${ZONE} -variables ${DAISY_VARS} ${WF}" + +echo "Running daisy workflow for package builds" +echo "Daisy command: ${DAISY_CMD}" +$DAISY_CMD 2>err | tee out +if [[ ${PIPESTATUS[0]} -ne 0 ]]; then + echo "error running daisy: stderr: $(<err)" + exit 1 +fi + +# TODO: pass this in +pattern="https://console.cloud.google.com/storage/browser/" +DAISY_BUCKET="gs://$(sed -En "s|(^.*)$pattern||p" out)" + +# copy daisy logs and artifacts to artifacts folder for prow +# $ARTIFACTS is set by prow +if [[ -n $ARTIFACTS ]]; then + echo "copying daisy outputs from ${DAISY_BUCKET}/packages to prow artifacts dir" + gsutil cp "${DAISY_BUCKET}/packages/*" ${ARTIFACTS}/ +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osconfig-20240927.00/presubmit_packagebuild/main.sh new/osconfig-20241017.00/presubmit_packagebuild/main.sh --- old/osconfig-20240927.00/presubmit_packagebuild/main.sh 2024-09-27 16:08:37.000000000 +0200 +++ new/osconfig-20241017.00/presubmit_packagebuild/main.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,131 +0,0 @@ -#!/bin/bash -# Copyright 2019 Google Inc. All Rights Reserved. -# -# 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. - -PROJECT="$1" -ZONE="$2" -DISTROS="$3" # Distros to build -GCS_OUTPUT_BUCKET="$4" # Destination for artifacts -BUILD_DIR="$5" # Directory to build from -VERSION="" - -# Workflow consisting entirely of separate IncludeWorkflow steps referencing -# build_${distro}.wf.json, which should be checked out from guest-test-infra. -function generate_build_workflow() { - local WF="$1" - - config='{ - "Name": "build-packages", - "DefaultTimeout": "30m", - "Vars": { - "gcs_path": { - "Value": "${SCRATCHPATH}/packages", - "Description": "GCS path for built packages e.g. gs://my-bucket/packages" - }, - "repo_owner": { - "Value": "GoogleCloudPlatform", - "Description": "GitHub repo owner or organization" - }, - "repo_name": { - "Description": "Github repo name", - "Required": true - }, - "git_ref": { - "Value": "master", - "Description": "Git ref to check out and build" - }, - "version": { - "Description": "Version to build" - }, - "build_dir": { - "Description": "Directory to build from" - } - }, - "Steps": {' - - for distro in ${DISTROS//,/ }; do - distrodash=$(echo "$distro" | tr '_' '-') - if [[ "$config" =~ IncludeWorkflow ]]; then - # Append additional steps - config="${config}," - fi - config="${config}\n"' "'"$distrodash"'": { - "IncludeWorkflow": { - "Path": "./workflows/build_'"$distro"'.wf.json", - "Vars": { - "gcs_path": "${gcs_path}", - "repo_owner": "${repo_owner}", - "repo_name": "${repo_name}", - "git_ref": "${git_ref}", - "build_dir": "${build_dir}", - "version": "${version}" - } - } - }' - done - - config="$config"' - } -}' - echo -e "$config" > "$WF" -} - -# Sets service account used for daisy and gsutil commands below. Will use -# default service account for VM or k8s node if not set. -if [[ -n $GOOGLE_APPLICATION_CREDENTIALS ]]; then - gcloud auth activate-service-account --key-file=$GOOGLE_APPLICATION_CREDENTIALS -fi - -cd /packagebuild - -WF="build.wf.json" -generate_build_workflow "$WF" -echo "Generated workflow:" -cat "$WF" - -## Some vars such as REPO_OWNER and PULL_NUMBER are set by prow -DAISY_VARS="repo_owner=${REPO_OWNER},repo_name=${REPO_NAME}" - -## only add pull reference in case of presubmit jobs -if [[ "$JOB_TYPE" == "presubmit" ]]; then - DAISY_VARS+=",git_ref=pull/${PULL_NUMBER}/head" -else - DAISY_VARS+=",git_ref=${PULL_BASE_REF}" -fi - -## Build from subdir if requested -if [[ -n "$BUILD_DIR" ]]; then - DAISY_VARS+=",build_dir=${BUILD_DIR}" -fi - -DAISY_CMD="/daisy -project ${PROJECT} -zone ${ZONE} -variables ${DAISY_VARS} ${WF}" - -echo "Running daisy workflow for package builds" -echo "Daisy command: ${DAISY_CMD}" -$DAISY_CMD 2>err | tee out -if [[ ${PIPESTATUS[0]} -ne 0 ]]; then - echo "error running daisy: stderr: $(<err)" - exit 1 -fi - -# TODO: pass this in -pattern="https://console.cloud.google.com/storage/browser/" -DAISY_BUCKET="gs://$(sed -En "s|(^.*)$pattern||p" out)" - -# copy daisy logs and artifacts to artifacts folder for prow -# $ARTIFACTS is set by prow -if [[ -n $ARTIFACTS ]]; then - echo "copying daisy outputs from ${DAISY_BUCKET}/packages to prow artifacts dir" - gsutil cp "${DAISY_BUCKET}/packages/*" ${ARTIFACTS}/ -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osconfig-20240927.00/presubmit_packagebuild/packagebuild-presubmit-cloudbuild.yaml new/osconfig-20241017.00/presubmit_packagebuild/packagebuild-presubmit-cloudbuild.yaml --- old/osconfig-20240927.00/presubmit_packagebuild/packagebuild-presubmit-cloudbuild.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/osconfig-20241017.00/presubmit_packagebuild/packagebuild-presubmit-cloudbuild.yaml 2024-10-17 11:18:19.000000000 +0200 @@ -0,0 +1,9 @@ +timeout: 5400s + +steps: +- name: 'europe-docker.pkg.dev/osconfig-agent-presubmits/osconfig-package-build-presubmit/osconfig-package-build-presubmit:latest' + args: ["osconfig-agent-presubmits", "europe-west4-a", "deb11,el8,el8_arm64,el9,el9_arm64,goo"] + env: ['REPO_OWNER=GoogleCloudPlatform', 'REPO_NAME=osconfig', 'JOB_TYPE=presubmit', 'PULL_NUMBER=$_PR_NUMBER'] + +options: + defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET ++++++ vendor.tar.gz ++++++