From 03a858f487715ae31ce7a4322dfeffffbcc6213d Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 8 Feb 2022 21:26:06 +0800 Subject: [PATCH 1/2] Chore: Update year in license header --- charon/__init__.py | 2 +- charon/cmd/__init__.py | 2 +- charon/cmd/command.py | 2 +- charon/config.py | 2 +- charon/constants.py | 2 +- charon/pkgs/__init__.py | 2 +- charon/pkgs/indexing.py | 2 +- charon/pkgs/maven.py | 2 +- charon/pkgs/npm.py | 2 +- charon/storage.py | 2 +- charon/utils/__init__.py | 2 +- charon/utils/archive.py | 2 +- charon/utils/files.py | 2 +- charon/utils/logs.py | 2 +- setup.py | 2 +- tests/base.py | 2 +- tests/test_config.py | 2 +- tests/test_indexing.py | 2 +- tests/test_maven_del.py | 2 +- tests/test_maven_index.py | 2 +- tests/test_maven_meta.py | 2 +- tests/test_maven_upload.py | 2 +- tests/test_npm_del.py | 2 +- tests/test_npm_index.py | 2 +- tests/test_npm_meta.py | 2 +- tests/test_npm_upload.py | 2 +- tests/test_pkgs_dryrun.py | 2 +- tests/test_s3client.py | 2 +- tests/test_util.py | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/charon/__init__.py b/charon/__init__.py index cbec8dd1..ca82d84e 100644 --- a/charon/__init__.py +++ b/charon/__init__.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charon/cmd/__init__.py b/charon/cmd/__init__.py index dbff095e..9eefcae0 100644 --- a/charon/cmd/__init__.py +++ b/charon/cmd/__init__.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charon/cmd/command.py b/charon/cmd/command.py index 46ada2d7..36ca99ec 100644 --- a/charon/cmd/command.py +++ b/charon/cmd/command.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charon/config.py b/charon/config.py index 18ecdd42..0311967d 100644 --- a/charon/config.py +++ b/charon/config.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charon/constants.py b/charon/constants.py index 0fdc01b1..2b560eb7 100644 --- a/charon/constants.py +++ b/charon/constants.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charon/pkgs/__init__.py b/charon/pkgs/__init__.py index dbff095e..9eefcae0 100644 --- a/charon/pkgs/__init__.py +++ b/charon/pkgs/__init__.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charon/pkgs/indexing.py b/charon/pkgs/indexing.py index bcb5d1f5..d29914f8 100644 --- a/charon/pkgs/indexing.py +++ b/charon/pkgs/indexing.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charon/pkgs/maven.py b/charon/pkgs/maven.py index dd60c2e5..0271c393 100644 --- a/charon/pkgs/maven.py +++ b/charon/pkgs/maven.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charon/pkgs/npm.py b/charon/pkgs/npm.py index 52477e57..53a226d8 100644 --- a/charon/pkgs/npm.py +++ b/charon/pkgs/npm.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charon/storage.py b/charon/storage.py index 99a46d9e..994363cb 100644 --- a/charon/storage.py +++ b/charon/storage.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charon/utils/__init__.py b/charon/utils/__init__.py index dbff095e..9eefcae0 100644 --- a/charon/utils/__init__.py +++ b/charon/utils/__init__.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charon/utils/archive.py b/charon/utils/archive.py index 3dbd2081..ae6f6f3c 100644 --- a/charon/utils/archive.py +++ b/charon/utils/archive.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charon/utils/files.py b/charon/utils/files.py index 22559ab4..d2889b79 100644 --- a/charon/utils/files.py +++ b/charon/utils/files.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charon/utils/logs.py b/charon/utils/logs.py index a832b562..ed8469f9 100644 --- a/charon/utils/logs.py +++ b/charon/utils/logs.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/setup.py b/setup.py index 6d10dbd2..5178e079 100755 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/base.py b/tests/base.py index 011a5b0f..2249d4e6 100644 --- a/tests/base.py +++ b/tests/base.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_config.py b/tests/test_config.py index a8aeceec..7014ed5d 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_indexing.py b/tests/test_indexing.py index 1d03979a..3fb17545 100644 --- a/tests/test_indexing.py +++ b/tests/test_indexing.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_maven_del.py b/tests/test_maven_del.py index 79ea0bcf..d5aa221a 100644 --- a/tests/test_maven_del.py +++ b/tests/test_maven_del.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_maven_index.py b/tests/test_maven_index.py index 74402dbe..af50ea3b 100644 --- a/tests/test_maven_index.py +++ b/tests/test_maven_index.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_maven_meta.py b/tests/test_maven_meta.py index 21d8e409..7c86c6c4 100644 --- a/tests/test_maven_meta.py +++ b/tests/test_maven_meta.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_maven_upload.py b/tests/test_maven_upload.py index c1bcb822..fbf34500 100644 --- a/tests/test_maven_upload.py +++ b/tests/test_maven_upload.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_npm_del.py b/tests/test_npm_del.py index 67a8ec7c..34dcf230 100644 --- a/tests/test_npm_del.py +++ b/tests/test_npm_del.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_npm_index.py b/tests/test_npm_index.py index 9f5e29cb..944126d4 100644 --- a/tests/test_npm_index.py +++ b/tests/test_npm_index.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_npm_meta.py b/tests/test_npm_meta.py index 94de8746..5cff2321 100644 --- a/tests/test_npm_meta.py +++ b/tests/test_npm_meta.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_npm_upload.py b/tests/test_npm_upload.py index 47672fc2..10b8f45b 100644 --- a/tests/test_npm_upload.py +++ b/tests/test_npm_upload.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_pkgs_dryrun.py b/tests/test_pkgs_dryrun.py index c474fda7..1fd5abe5 100644 --- a/tests/test_pkgs_dryrun.py +++ b/tests/test_pkgs_dryrun.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_s3client.py b/tests/test_s3client.py index d086c46b..2a7dad80 100644 --- a/tests/test_s3client.py +++ b/tests/test_s3client.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tests/test_util.py b/tests/test_util.py index be44babf..584920c2 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon) +Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 9e3fa4f53887a9a6a5be2dea2195a4125862d813 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 8 Feb 2022 22:18:56 +0800 Subject: [PATCH 2/2] Fix: Test failure in centos 8 caused by repo metadata downloading problem --- test.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test.sh b/test.sh index bfcff1dc..aa57037d 100755 --- a/test.sh +++ b/test.sh @@ -43,6 +43,9 @@ function setup_charon() { if [[ $OS == "centos" ]]; then # Don't let builddep enable *-source repos since they give 404 errors $RUN rm -f /etc/yum.repos.d/CentOS-Sources.repo + # Resolve "Failed to download metadata for repo: Cannot prepare internal mirrorlist: No URLs in mirrorlist" problem + $RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-AppStream.repo + $RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-BaseOS.repo # This has to run *before* we try installing anything from EPEL $RUN $PKG $ENABLE_REPO install -y epel-release fi