diff --git a/.github/template_gitref b/.github/template_gitref index 0616c6fa2..09354118f 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-334-gb19dead +2021.08.26-335-gdf91f79 diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 91086b04b..bbf701e32 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -155,9 +155,6 @@ sudo chown -R 700:700 ~/.config echo ::group::SSL # Copy pulp CA sudo docker cp pulp:/etc/pulp/certs/pulp_webserver.crt /usr/local/share/ca-certificates/pulp_webserver.crt -if [[ "ghcr.io/pulp/pulp-ci-centos" = */pulp-ci-centos9 ]]; then - sudo docker exec -u root pulp trust anchor /etc/pulp/certs/pulp_webserver.crt -fi # Hack: adding pulp CA to certifi.where() CERTIFI=$(python -c 'import certifi; print(certifi.where())') @@ -186,9 +183,6 @@ if [[ "$TEST" = "azure" ]]; then cat /usr/local/share/ca-certificates/azcert.crt >> $AZCERTIFI cat /usr/local/share/ca-certificates/azcert.crt | cmd_stdin_prefix tee -a "$PULPCERTIFI" > /dev/null cat /usr/local/share/ca-certificates/azcert.crt | cmd_stdin_prefix tee -a /etc/pki/tls/cert.pem > /dev/null - if [[ "ghcr.io/pulp/pulp-ci-centos" = */pulp-ci-centos9 ]]; then - cmd_stdin_prefix sudo trust anchor /etc/pki/tls/cert.pem - fi AZURE_STORAGE_CONNECTION_STRING='DefaultEndpointsProtocol=https;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=https://ci-azurite:10000/devstoreaccount1;' az storage container create --name pulp-test --connection-string $AZURE_STORAGE_CONNECTION_STRING fi