diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global-macros.yaml | 17 | ||||
| -rw-r--r-- | jjb/scripts/publish_backup_logs.sh | 39 |
2 files changed, 1 insertions, 55 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 7eb6af4dc..5043b8681 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -729,7 +729,7 @@ # macro to finish up a build. # # Handles the following: - # - Shipping logs to Nexus or S3 logs repository + # - Shipping logs to S3 logs repository # - Cleanup workspace publishers: - postbuildscript: @@ -744,7 +744,6 @@ build-steps: - shell: !include-raw: scripts/post_build_executor_info.sh - shell: !include-raw: scripts/post_build_deploy_archives.sh - - fdio-infra-ship-backup-logs - fdio-infra-ship-logs mark-unstable-if-failed: true - workspace-cleanup: @@ -796,20 +795,6 @@ $WORKSPACE/scripts/check-unicode.sh jjb/ - builder: - name: fdio-infra-ship-backup-logs - builders: - - config-file-provider: - files: - - file-id: "jenkins-s3-log-ship" - target: $HOME/.aws/credentials - - shell: !include-raw: - - scripts/publish_library_py.sh - - shell: !include-raw: - - scripts/publish_backup_logs.sh - - shell: !include-raw: - - ../global-jjb/shell/logs-clear-credentials.sh - -- builder: name: fdio-infra-ship-docs builders: - config-file-provider: diff --git a/jjb/scripts/publish_backup_logs.sh b/jjb/scripts/publish_backup_logs.sh deleted file mode 100644 index 002b08308..000000000 --- a/jjb/scripts/publish_backup_logs.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2021 Cisco and/or its affiliates. -# 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. - -echo "---> publish_backup_logs.sh" - -S3_BUCKET="logs.fd.io" -CDN_URL="logs.nginx.service.consul" -export AWS_ENDPOINT_URL="http://storage.service.consul:9000" -PYTHON_SCRIPT="/w/workspace/publish_library.py" - -# FIXME: s3 config (until migrated to config provider, then pwd will be reset) -mkdir -p ${HOME}/.aws -echo "[default] -aws_access_key_id = storage -aws_secret_access_key = Storage1234" > "$HOME/.aws/credentials" - -mkdir -p "$WORKSPACE/archives" - -s3_path="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER/" - -echo "INFO: S3 path $s3_path" - -echo "INFO: archiving backup logs to S3" -python3 $PYTHON_SCRIPT deploy_s3 "$S3_BUCKET" "$s3_path" \ - "$BUILD_URL" "$WORKSPACE" - -echo "S3 build backup logs: <a href=\"https://$CDN_URL/$s3_path\">https://$CDN_URL/$s3_path</a>" |