From 972e73e5c4d97c1014851debd0e6e712cc387bc0 Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Feb 14 2022 11:33:57 +0000 Subject: update copr-fe-dev hostname I did grep -rl "copr-fe-dev.aws.fedoraproject.org" . \ | xargs sed -i 's/copr-fe-dev.aws.fedoraproject.org/copr.stg.fedoraproject.org/g' grep -rl "copr-fe-dev.cloud.fedoraproject.org" . \ | xargs sed -i 's/copr-fe-dev.cloud.fedoraproject.org/copr.stg.fedoraproject.org/g' --- diff --git a/backend/conf/copr-be.conf.example b/backend/conf/copr-be.conf.example index 9efc578..88297c9 100644 --- a/backend/conf/copr-be.conf.example +++ b/backend/conf/copr-be.conf.example @@ -6,7 +6,7 @@ results_baseurl=https://copr-be.cloud.fedoraproject.org/results # Mandatory http address of running Copr Frontend instance. Backend talks to # Frontend e.g. over /backend/ URL. # default is http://copr-fe -frontend_base_url=http://copr-fe-dev.cloud.fedoraproject.org +frontend_base_url=http://copr.stg.fedoraproject.org # must have same value as BACKEND_PASSWORD from have frontend in /etc/copr/copr.conf # default is PASSWORDHERE but you really should change it. really. diff --git a/backend/conf/copr-be.local.conf b/backend/conf/copr-be.local.conf index d0c4e72..6ba78fe 100644 --- a/backend/conf/copr-be.local.conf +++ b/backend/conf/copr-be.local.conf @@ -5,7 +5,7 @@ results_baseurl=https://copr-be.cloud.fedoraproject.org/results # default is http://coprs/rest/api -frontend_base_url=http://copr-fe-dev.cloud.fedoraproject.org +frontend_base_url=http://copr.stg.fedoraproject.org # must have same value as BACKEND_PASSWORD from have frontend in /etc/copr/copr.conf # default is PASSWORDHERE but you really should change it. really. diff --git a/beaker-tests/DockerTestEnv/Dockerfile b/beaker-tests/DockerTestEnv/Dockerfile index f68ed1c..23bbac4 100644 --- a/beaker-tests/DockerTestEnv/Dockerfile +++ b/beaker-tests/DockerTestEnv/Dockerfile @@ -30,7 +30,7 @@ COPY bashrc /root/.bashrc_copr RUN echo "source /root/.bashrc_copr" >> /root/.bashrc -RUN echo -e "[tested-copr]\nhostname = copr-fe-dev.cloud.fedoraproject.org\nprotocol = https\nport = 443\n" \ +RUN echo -e "[tested-copr]\nhostname = copr.stg.fedoraproject.org\nprotocol = https\nport = 443\n" \ > /etc/dnf/plugins/copr.d/tested-copr.conf # Run this container with -ti to avoid an immediate shutdown! diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/config b/beaker-tests/Sanity/copr-cli-basic-operations/config index 53d749b..2b8012e 100644 --- a/beaker-tests/Sanity/copr-cli-basic-operations/config +++ b/beaker-tests/Sanity/copr-cli-basic-operations/config @@ -6,7 +6,7 @@ # tests against a local dev stack). For this reason, the following # settings are override-able from command line. -: "${FRONTEND_URL=https://copr-fe-dev.cloud.fedoraproject.org}" +: "${FRONTEND_URL=https://copr.stg.fedoraproject.org}" : "${BACKEND_URL=https://copr-be-dev.cloud.fedoraproject.org}" : "${DISTGIT_URL=https://copr-dist-git-dev.fedorainfracloud.org}" : "${OWNER=@copr}" diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/files/copr-config-bad b/beaker-tests/Sanity/copr-cli-basic-operations/files/copr-config-bad index cc1d220..cd306b2 100644 --- a/beaker-tests/Sanity/copr-cli-basic-operations/files/copr-config-bad +++ b/beaker-tests/Sanity/copr-cli-basic-operations/files/copr-config-bad @@ -2,5 +2,5 @@ login = arctfgmbntgnlgjnaioa username = clime token = cwkumbwcynvpbzwcucgqpkxucqhsaa -copr_url = https://copr-fe-dev.cloud.fedoraproject.org +copr_url = https://copr.stg.fedoraproject.org # expiration date: 2018-01-27 diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/helpers b/beaker-tests/Sanity/copr-cli-basic-operations/helpers index 00d504b..ae8b048 100644 --- a/beaker-tests/Sanity/copr-cli-basic-operations/helpers +++ b/beaker-tests/Sanity/copr-cli-basic-operations/helpers @@ -95,7 +95,7 @@ setup_checks() # we currently support only staging instances _frontend_url=$(grep ^copr_url "$_config" | cut -d= -f2) case $_frontend_url in - *copr-fe-dev.cloud.fedoraproject.org) ;; + *copr.stg.fedoraproject.org) ;; *dev-copr.devel.redhat.com) ;; *) rlDie "improper copr_url in $_config" ;; esac diff --git a/behave/features/environment.py b/behave/features/environment.py index da46c9c..da4b3aa 100644 --- a/behave/features/environment.py +++ b/behave/features/environment.py @@ -22,7 +22,7 @@ def before_all(context): context.frontend_url = os.environ.get( "FRONTEND_URL", - "https://copr-fe-dev.cloud.fedoraproject.org") + "https://copr.stg.fedoraproject.org") context.backend_url = os.environ.get( "BACKEND_URL", "https://copr-be-dev.cloud.fedoraproject.org") diff --git a/cli/copr_cli/README.rst b/cli/copr_cli/README.rst index dabb6b3..ffc1a0a 100644 --- a/cli/copr_cli/README.rst +++ b/cli/copr_cli/README.rst @@ -14,7 +14,7 @@ About this project: - Website: https://pagure.io/copr/copr - Git: http://git.fedorahosted.org/cgit/copr.git - Production Fedora instance: https://copr.fedorainfracloud.org/ -- Development Fedora instance: http://copr-fe-dev.cloud.fedoraproject.org/ +- Development Fedora instance: http://copr.stg.fedoraproject.org/ Dependencies: @@ -31,7 +31,7 @@ The CLI depends on: Usage: ------ -.. _test instance: http://copr-fe-dev.cloud.fedoraproject.org/ +.. _test instance: http://copr.stg.fedoraproject.org/ - Create an account on copr `test instance`_ - Go to the API page: http://copr.fedoraproject.org/api diff --git a/dist-git/conf/copr-dist-git.conf.example b/dist-git/conf/copr-dist-git.conf.example index 74c5163..4ea2277 100644 --- a/dist-git/conf/copr-dist-git.conf.example +++ b/dist-git/conf/copr-dist-git.conf.example @@ -1,7 +1,7 @@ [dist-git] # default is http://coprs/rest/api -frontend_base_url=http://copr-fe-dev.cloud.fedoraproject.org +frontend_base_url=http://copr.stg.fedoraproject.org # must have same value as BACKEND_PASSWORD from have frontend in /etc/copr/copr.conf # default is PASSWORDHERE but you really should change it. really. diff --git a/doc/how_to_release_copr.rst b/doc/how_to_release_copr.rst index 0713f48..5cebc25 100644 --- a/doc/how_to_release_copr.rst +++ b/doc/how_to_release_copr.rst @@ -78,9 +78,9 @@ Check that .repo files correctly points to ``@copr/copr``. And run on batcave01. manual/copr/copr-keygen-upgrade.yml sudo rbac-playbook -l copr-keygen-dev.aws.fedoraproject.org groups/copr-keygen.yml - sudo rbac-playbook -l copr-fe-dev.aws.fedoraproject.org \ + sudo rbac-playbook -l copr.stg.fedoraproject.org \ manual/copr/copr-frontend-upgrade.yml - sudo rbac-playbook -l copr-fe-dev.aws.fedoraproject.org groups/copr-frontend.yml + sudo rbac-playbook -l copr.stg.fedoraproject.org groups/copr-frontend.yml sudo rbac-playbook -l copr-dist-git-dev.aws.fedoraproject.org \ manual/copr/copr-dist-git-upgrade.yml diff --git a/doc/how_to_upgrade_builders.rst b/doc/how_to_upgrade_builders.rst index 2ab85b7..f15e6e7 100644 --- a/doc/how_to_upgrade_builders.rst +++ b/doc/how_to_upgrade_builders.rst @@ -315,7 +315,7 @@ the old but currently unused builders by:: .. _`Alternate Architectures page`: https://alt.fedoraproject.org/alt .. _`Koji compose directory listing`: https://kojipkgs.fedoraproject.org/compose/cloud/ .. _`Ansible git repo`: https://infrastructure.fedoraproject.org/cgit/ansible.git/ -.. _`staging copr instance`: https://copr-fe-dev.cloud.fedoraproject.org +.. _`staging copr instance`: https://copr.stg.fedoraproject.org .. _`AWS login link`: https://id.fedoraproject.org/saml2/SSO/Redirect?SPIdentifier=urn:amazon:webservices&RelayState=https://console.aws.amazon.com .. _`ibmcloud tool is not FLOSS`: https://github.com/IBM-Cloud/ibm-cloud-cli-release/issues/162 .. _`container image for uploading`: https://github.com/praiskup/ibmcloud-cli-fedora-container diff --git a/doc/how_to_upgrade_persistent_instances.rst b/doc/how_to_upgrade_persistent_instances.rst index f5e1e99..a964af5 100644 --- a/doc/how_to_upgrade_persistent_instances.rst +++ b/doc/how_to_upgrade_persistent_instances.rst @@ -297,7 +297,7 @@ In the fedora-infra ansible repository, edit ``inventory/inventory`` file and set ``birthday=yes`` variable for your host, e.g.:: [copr_front_dev_aws] - copr-fe-dev.aws.fedoraproject.org birthday=yes + copr.stg.fedoraproject.org birthday=yes On batcave01 run playbook to provision the instance (ignore the playbook for upgrading Copr packages). diff --git a/doc/index.rst b/doc/index.rst index 6f03188..de73b01 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -46,7 +46,7 @@ Instances --------- * https://copr.fedorainfracloud.org/ (preferred) -* http://copr-fe-dev.cloud.fedoraproject.org/ (staging instance, broken most of the time). +* http://copr.stg.fedoraproject.org/ (staging instance, broken most of the time). Need To Edit This Wiki? ----------------------- diff --git a/frontend/coprs_frontend/config/copr_devel.conf b/frontend/coprs_frontend/config/copr_devel.conf index 5200c38..91c2ab1 100644 --- a/frontend/coprs_frontend/config/copr_devel.conf +++ b/frontend/coprs_frontend/config/copr_devel.conf @@ -41,7 +41,7 @@ ENFORCE_PROTOCOL_FOR_BACKEND_URL = "http" ## post-process url leading to frontend ENFORCE_PROTOCOL_FOR_FRONTEND_URL = "http" -PUBLIC_COPR_HOSTNAME = "copr-fe-dev.cloud.fedoraproject.org" +PUBLIC_COPR_HOSTNAME = "copr.stg.fedoraproject.org" BACKEND_BASE_URL = "http://copr-be-dev.cloud.fedoraproject.org" DIST_GIT_URL = "http://copr-dist-git-dev.fedorainfracloud.org/cgit/" diff --git a/frontend/coprs_frontend/coprs/config.py b/frontend/coprs_frontend/coprs/config.py index d057910..ae25fda 100644 --- a/frontend/coprs_frontend/coprs/config.py +++ b/frontend/coprs_frontend/coprs/config.py @@ -44,12 +44,12 @@ class Config(object): # post-process url leading to frontend ENFORCE_PROTOCOL_FOR_FRONTEND_URL = None - PUBLIC_COPR_BASE_URL = "https://copr-fe-dev.cloud.fedoraproject.org" - PUBLIC_COPR_HOSTNAME = "copr-fe-dev.cloud.fedoraproject.org" + PUBLIC_COPR_BASE_URL = "https://copr.stg.fedoraproject.org" + PUBLIC_COPR_HOSTNAME = "copr.stg.fedoraproject.org" DIST_GIT_URL = None COPR_DIST_GIT_LOGS_URL = None - MBS_URL = "http://copr-fe-dev.cloud.fedoraproject.org/module/1/module-builds/" + MBS_URL = "http://copr.stg.fedoraproject.org/module/1/module-builds/" # primary log file LOG_FILENAME = "/var/log/copr-frontend/frontend.log" diff --git a/frontend/docs/api_2/source/Resources/build.rst b/frontend/docs/api_2/source/Resources/build.rst index ee93baa..7d3b1a2 100644 --- a/frontend/docs/api_2/source/Resources/build.rst +++ b/frontend/docs/api_2/source/Resources/build.rst @@ -285,7 +285,7 @@ MUST be uploaded as binary ``srpm`` file. >>> import json >>> from requests import post - >>> api_url = "http://copr-fe-dev.cloud.fedoraproject.org/api_2/builds" + >>> api_url = "http://copr.stg.fedoraproject.org/api_2/builds" >>> api_login = "my api login" >>> api_token = "my api token" >>> metadata = { @@ -302,7 +302,7 @@ MUST be uploaded as binary ``srpm`` file. >>> r.status_code 201 >>> r.headers["Location"] - http://copr-fe-dev.cloud.fedoraproject.org/api_2/builds/106899 + http://copr.stg.fedoraproject.org/api_2/builds/106899 Get build details ----------------- diff --git a/python/copr/README.rst b/python/copr/README.rst index 883ddcd..70f630e 100644 --- a/python/copr/README.rst +++ b/python/copr/README.rst @@ -14,7 +14,7 @@ About this project: - Website: https://pagure.io/copr/copr - Python-copr documentation: http://python-copr.readthedocs.org - Git: https://pagure.io/copr/copr.git -- Test instance: http://copr-fe-dev.cloud.fedoraproject.org/ +- Test instance: http://copr.stg.fedoraproject.org/ Usage: ------ diff --git a/python/docs/client_v2/resources_usage.rst b/python/docs/client_v2/resources_usage.rst index 42bca76..3d56109 100644 --- a/python/docs/client_v2/resources_usage.rst +++ b/python/docs/client_v2/resources_usage.rst @@ -12,7 +12,7 @@ all projects with name ``copr`` we would receive collection :py:class:`~copr.cli >>> from copr import create_client2_from_params # using dev server for test - >>> cl = create_client2_from_params(root_url="http://copr-fe-dev.cloud.fedoraproject.org/") + >>> cl = create_client2_from_params(root_url="http://copr.stg.fedoraproject.org/") >>> projects = cl.projects.get_list(name="copr", limit=3) >>> for p in projects: diff --git a/releng/run-on-all-infra b/releng/run-on-all-infra index 3951094..ee7af72 100755 --- a/releng/run-on-all-infra +++ b/releng/run-on-all-infra @@ -39,7 +39,7 @@ INSTANCES = { "copr-keygen.aws.fedoraproject.org", ], "dev": [ - "copr-fe-dev.aws.fedoraproject.org", + "copr.stg.fedoraproject.org", "copr-be-dev.aws.fedoraproject.org", "copr-dist-git-dev.aws.fedoraproject.org", "copr-keygen-dev.aws.fedoraproject.org",