From a4da8048700204f50e377a44e8116e519fcffde7 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 11 Aug 2021 07:33:58 -0400 Subject: [PATCH 1/5] Stop using the dockerhub-auth context for normal jobs --- .circleci/config.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1fb7558de..8aa039694 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,18 +16,8 @@ workflows: jobs: # Start with jobs testing various platforms. - # Every job that pulls a Docker image from Docker Hub needs to provide - # credentials for that pull operation to avoid being subjected to - # unauthenticated pull limits shared across all of CircleCI. Use this - # first job to define a yaml anchor that can be used to supply a - # CircleCI job context which makes Docker Hub credentials available in - # the environment. - # - # Contexts are managed in the CircleCI web interface: - # - # https://app.circleci.com/settings/organization/github/tahoe-lafs/contexts - "debian-9": &DOCKERHUB_CONTEXT - context: "dockerhub-auth" + {} - "debian-10": <<: *DOCKERHUB_CONTEXT From c5fec82328231c718ce8bcfbf02c670bf3305136 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 11 Aug 2021 07:40:16 -0400 Subject: [PATCH 2/5] CircleCI succeeds in pulling the docker images without this It says "Warning!" but then says it is going to use its own credentials. Great. Just what I want. --- .circleci/config.yml | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8aa039694..3e48203c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,72 +15,49 @@ workflows: ci: jobs: # Start with jobs testing various platforms. - - - "debian-9": &DOCKERHUB_CONTEXT - {} - + - "debian-9": - "debian-10": - <<: *DOCKERHUB_CONTEXT requires: - "debian-9" - "ubuntu-20-04": - <<: *DOCKERHUB_CONTEXT - "ubuntu-18-04": - <<: *DOCKERHUB_CONTEXT requires: - "ubuntu-20-04" - "ubuntu-16-04": - <<: *DOCKERHUB_CONTEXT requires: - "ubuntu-20-04" - "fedora-29": - <<: *DOCKERHUB_CONTEXT - "fedora-28": - <<: *DOCKERHUB_CONTEXT requires: - "fedora-29" - "centos-8": - <<: *DOCKERHUB_CONTEXT - - "nixos-19-09": - <<: *DOCKERHUB_CONTEXT # Test against PyPy 2.7 - "pypy27-buster": - <<: *DOCKERHUB_CONTEXT # Just one Python 3.6 configuration while the port is in-progress. - "python36": - <<: *DOCKERHUB_CONTEXT # Other assorted tasks and configurations - "lint": - <<: *DOCKERHUB_CONTEXT - "pyinstaller": - <<: *DOCKERHUB_CONTEXT - "deprecations": - <<: *DOCKERHUB_CONTEXT - "c-locale": - <<: *DOCKERHUB_CONTEXT # Any locale other than C or UTF-8. - "another-locale": - <<: *DOCKERHUB_CONTEXT - "integration": - <<: *DOCKERHUB_CONTEXT requires: # If the unit test suite doesn't pass, don't bother running the # integration tests. - "debian-9" - "typechecks": - <<: *DOCKERHUB_CONTEXT - - "docs": - <<: *DOCKERHUB_CONTEXT images: # Build the Docker images used by the ci jobs. This makes the ci jobs From 6f36f85a87330569475eb81cb483d600107730eb Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 11 Aug 2021 07:41:59 -0400 Subject: [PATCH 3/5] Define the yaml anchor elsewhere, where it is still needed --- .circleci/config.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e48203c0..7db863847 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,8 +72,16 @@ workflows: - "master" jobs: - - "build-image-debian-10": - <<: *DOCKERHUB_CONTEXT + # Every job that pushes a Docker image from Docker Hub needs to provide + # credentials. Use this first job to define a yaml anchor that can be + # used to supply a CircleCI job context which makes Docker Hub + # credentials available in the environment. + # + # Contexts are managed in the CircleCI web interface: + # + # https://app.circleci.com/settings/organization/github/tahoe-lafs/contexts + - "build-image-debian-10": &DOCKERHUB_CONTEXT + context: "dockerhub-auth" - "build-image-debian-9": <<: *DOCKERHUB_CONTEXT - "build-image-ubuntu-16-04": From 0e2c4ff7e65312a420df2c6b0effb939caa86c17 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 11 Aug 2021 07:45:45 -0400 Subject: [PATCH 4/5] I suppose you cannot define an empty yaml map by leaving everything out --- .circleci/config.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7db863847..f2d5a29b9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,11 +16,13 @@ workflows: jobs: # Start with jobs testing various platforms. - "debian-9": + {} - "debian-10": requires: - "debian-9" - "ubuntu-20-04": + {} - "ubuntu-18-04": requires: - "ubuntu-20-04" @@ -29,26 +31,37 @@ workflows: - "ubuntu-20-04" - "fedora-29": + {} - "fedora-28": requires: - "fedora-29" - "centos-8": + {} + - "nixos-19-09": + {} # Test against PyPy 2.7 - "pypy27-buster": + {} # Just one Python 3.6 configuration while the port is in-progress. - "python36": + {} # Other assorted tasks and configurations - "lint": + {} - "pyinstaller": + {} - "deprecations": + {} - "c-locale": + {} # Any locale other than C or UTF-8. - "another-locale": + {} - "integration": requires: @@ -57,7 +70,9 @@ workflows: - "debian-9" - "typechecks": + {} - "docs": + {} images: # Build the Docker images used by the ci jobs. This makes the ci jobs From 02f82e2665b7c8af1ab6a7278435bdfda837ca3d Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 11 Aug 2021 10:00:06 -0400 Subject: [PATCH 5/5] news fragment --- newsfragments/3759.minor | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newsfragments/3759.minor diff --git a/newsfragments/3759.minor b/newsfragments/3759.minor new file mode 100644 index 000000000..e69de29bb