Commit 5a573139 authored by Ľuboslav Pivarč's avatar Ľuboslav Pivarč
Browse files

Merge branch 'beta'

parents 7860d1a6 49ea5ebf
Pipeline #27826 waiting for manual action with stages
stages:
- prepare
- build
- deploy
.kube-auth: &kube-auth
.kube-auth: &kube-auth
- mkdir $HOME/.kube
- touch $HOME/.kube/config
- echo "$KUBE_CONFIG" >> $HOME/.kube/config
......@@ -21,6 +22,19 @@ stages:
- docker build --pull -t "${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-job${CI_COMMIT_SHA}" ./builds/job
- docker push "$CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME}-job${CI_COMMIT_SHA}"
.mellon template: &mellon-template
stage: prepare
image: registry.gitlab.ics.muni.cz:443/europdx/ci-images/ci:latest
before_script:
*kube-auth
script:
- cd mellon/${CI_COMMIT_REF_NAME}
- kubectl -n cbio-on-demand${NAMESPACE} create configmap cert --from-file=sp_cert.pem --dry-run -o yaml | kubectl apply -f -
- kubectl -n cbio-on-demand${NAMESPACE} create configmap xml --from-file=sp-metadata.xml --dry-run -o yaml | kubectl apply -f -
- export foo="${CI_COMMIT_REF_NAME}_KEY"
- foo=$(eval echo \$"$foo")
- mv $foo ./sp_key.pem
- kubectl -n cbio-on-demand${NAMESPACE} create secret generic key --from-file=sp_key.pem --dry-run -o yaml | kubectl apply -f -
.cbio-db-build-template: &cbio-db-build-template
stage: build
......@@ -43,9 +57,9 @@ stages:
.deploy-to-k8s-template: &deploy-to-k8s-template
stage: deploy
before_script:
before_script:
*kube-auth
image: registry.gitlab.ics.muni.cz:443/europdx/k8s/ci:latest
image: registry.gitlab.ics.muni.cz:443/europdx/ci-images/ci:latest
script:
- ./yaml/bash.sh
- kubectl version
......@@ -53,7 +67,7 @@ stages:
when:
manual
allow_failure: false
#PRODUCTION
cBioDb build:
<<: *cbio-db-build-template
......@@ -73,9 +87,16 @@ deploy to k8s:
<<: *deploy-to-k8s-template
only:
- master
#BETA
mellon beta:
<<: *mellon-template
variables:
NAMESPACE: -beta
only:
- beta
cBioDb build beta:
<<: *cbio-db-build-template
only:
......@@ -96,19 +117,22 @@ deploy to k8s beta:
- beta
#DEV
mellon dev:
<<: *mellon-template
variables:
NAMESPACE: -dev
only:
- dev
cBioDb build dev:
<<: *cbio-db-build-template
only:
#changes:
# - builds/cbiodb/*
refs:
- dev
cBioJob build dev:
<<: *cbio-job-build-template
only:
#changes:
# - builds/job/*
refs:
- dev
......
<EntityDescriptor entityID="http://cbiood-beta.edirex.ics.muni.cz/mellon" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIC2TCCAcECFBIHF8qnxco26wmPvh2BrP46lK/KMA0GCSqGSIb3DQEBCwUAMCkx
JzAlBgNVBAMMHmNiaW9vZC1iZXRhLmVkaXJleC5pY3MubXVuaS5jejAeFw0xOTA5
MzAxMDEyMDVaFw0yOTA5MjkxMDEyMDVaMCkxJzAlBgNVBAMMHmNiaW9vZC1iZXRh
LmVkaXJleC5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
ggEBALExJ1733itsr/bXRyR/hCKcpA8gROzwCuy4owf9EqIap1OkCzFc0jIIlF8J
4oP9l0dxnYGExeJ+Gr9h+VytH9LT/ZS+QoA2ROUMa+DxNSgw3/wSNKWd5YxR3ZxB
5d4jWNpv5uHuhNyJFnSWBAlTGnMW5RwfS3rgAz7qe3veJzmWcfsRim443eHcJDq+
VZcIhy6DoVWP2mKt777w7lqoeNbpF80+vBJCpxohFWAHO74mqel5uu6shyN5h87y
5sq5eneJNtHfTaG2pppuH398KoHE+dJ3vWMl1j6AUvZFLQhSZCdn934ez5Sbrlf/
mmw1l/CCtUiR1E0DpAM1YIbOFPcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAH6Tm
nPj1FxoK96G3BGen6FIUikeIgYiKAFmIcaG2AuUURu2BOdqghaw+JB6y9Q8lytve
nXznHi+/B7NxfqqaroIKp265h9lHJdk07TXxqE4UBtUVzNUlSN7nXOyMIOVKxIwU
Vie4vDoVSQjrMNgaVUX5ORojLhajAPDMDL9qIZkBh6j2TL2ZXG1vvTkdPhDk5W1R
A6BVDQvZ42Rt/p2NAV0eChi3/TXBCLT6UlvrI/6q8Cn8xuDNz80360WqWjtl8zxi
whjqOes6NR/RJNUJAIaTnms5RleLCbslZkZc8hvbBYRLZOEBQz4MUNsoJ5E4ih/N
UfudjCDRfld7Ri/dlg==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://cbiood-beta.edirex.ics.muni.cz/mellon/logout"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://cbiood-beta.edirex.ics.muni.cz/mellon/postResponse" index="0"/>
</SPSSODescriptor>
</EntityDescriptor>
-----BEGIN CERTIFICATE-----
MIIC2TCCAcECFBIHF8qnxco26wmPvh2BrP46lK/KMA0GCSqGSIb3DQEBCwUAMCkx
JzAlBgNVBAMMHmNiaW9vZC1iZXRhLmVkaXJleC5pY3MubXVuaS5jejAeFw0xOTA5
MzAxMDEyMDVaFw0yOTA5MjkxMDEyMDVaMCkxJzAlBgNVBAMMHmNiaW9vZC1iZXRh
LmVkaXJleC5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
ggEBALExJ1733itsr/bXRyR/hCKcpA8gROzwCuy4owf9EqIap1OkCzFc0jIIlF8J
4oP9l0dxnYGExeJ+Gr9h+VytH9LT/ZS+QoA2ROUMa+DxNSgw3/wSNKWd5YxR3ZxB
5d4jWNpv5uHuhNyJFnSWBAlTGnMW5RwfS3rgAz7qe3veJzmWcfsRim443eHcJDq+
VZcIhy6DoVWP2mKt777w7lqoeNbpF80+vBJCpxohFWAHO74mqel5uu6shyN5h87y
5sq5eneJNtHfTaG2pppuH398KoHE+dJ3vWMl1j6AUvZFLQhSZCdn934ez5Sbrlf/
mmw1l/CCtUiR1E0DpAM1YIbOFPcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAH6Tm
nPj1FxoK96G3BGen6FIUikeIgYiKAFmIcaG2AuUURu2BOdqghaw+JB6y9Q8lytve
nXznHi+/B7NxfqqaroIKp265h9lHJdk07TXxqE4UBtUVzNUlSN7nXOyMIOVKxIwU
Vie4vDoVSQjrMNgaVUX5ORojLhajAPDMDL9qIZkBh6j2TL2ZXG1vvTkdPhDk5W1R
A6BVDQvZ42Rt/p2NAV0eChi3/TXBCLT6UlvrI/6q8Cn8xuDNz80360WqWjtl8zxi
whjqOes6NR/RJNUJAIaTnms5RleLCbslZkZc8hvbBYRLZOEBQz4MUNsoJ5E4ih/N
UfudjCDRfld7Ri/dlg==
-----END CERTIFICATE-----
<EntityDescriptor entityID="http://cbiood-dev.edirex.ics.muni.cz/mellon" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIC1zCCAb8CFB0s0VwaoWp89LK8Xurrlg2nNld0MA0GCSqGSIb3DQEBCwUAMCgx
JjAkBgNVBAMMHWNiaW9vZC1kZXYuZWRpcmV4Lmljcy5tdW5pLmN6MB4XDTE5MDkz
MDEwMTI0NVoXDTI5MDkyOTEwMTI0NVowKDEmMCQGA1UEAwwdY2Jpb29kLWRldi5l
ZGlyZXguaWNzLm11bmkuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
AQDrPGJJWGVSVbvbjaOyYdb6s1cRPg0ygZ9ksmgVVEYjwmyudua/poaPyrsvdhnO
8Ec8Zr5qUyb6sj9MNHDhkhd7vLbayyBcRUbjb4bFA3g7rv3zyz7Oa4CYDdBrh57/
o74pLNNYWeP+h8u8F1QpI+oVHWcZQ/0/Vg2G6IExk/APPnQWWPQpHH5K4rq+tLTa
z1/fC/Y24YaoDhoq1UbBToXOK0mau95EiIpC3CQPgbjATwgF3KD/Ji6egzLwW+Mh
poADxt8XYQ+LVbRGCtm5gtPzcBGlx7tLnpAobJNZXQ3EPAgXlJ8tFhK2QLYu50qx
BQP68GhAzM5eT3vjG5uet4znAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGjBIgyX
Ri2wYqGzeX5tIgdqMhmmPvxVhAaOOT7enLlnp53gpq23fSUt7c+5lRZymnYKUlz2
XR2fiBP1ZS2H0iJvsZqnihOe7lEjVhzK5QVcenv+KCrph9x4wIZoAABONO/DnFwn
/DKSlmbe1RpLLU0VFE2Ny9lmHAKGWPrYVV6XspXJRAsFs2wR8voizpyjgMkH/7h9
XN96u3xdsAMAp5Kz9ZGpktcKVxYAHuvxOA/1qlXS419J9NCQzhHvLKBm0Pg0Hm0z
ionVDtYXgTtWIvvtirRnlAX7jmRKUOR9xLiw8d95wv/2X1TN6hMNPcl1nrgzSbrY
6O7m0xPEjKnsQis=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://cbiood-dev.edirex.ics.muni.cz/mellon/logout"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://cbiood-dev.edirex.ics.muni.cz/mellon/postResponse" index="0"/>
</SPSSODescriptor>
</EntityDescriptor>
-----BEGIN CERTIFICATE-----
MIIC1zCCAb8CFB0s0VwaoWp89LK8Xurrlg2nNld0MA0GCSqGSIb3DQEBCwUAMCgx
JjAkBgNVBAMMHWNiaW9vZC1kZXYuZWRpcmV4Lmljcy5tdW5pLmN6MB4XDTE5MDkz
MDEwMTI0NVoXDTI5MDkyOTEwMTI0NVowKDEmMCQGA1UEAwwdY2Jpb29kLWRldi5l
ZGlyZXguaWNzLm11bmkuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
AQDrPGJJWGVSVbvbjaOyYdb6s1cRPg0ygZ9ksmgVVEYjwmyudua/poaPyrsvdhnO
8Ec8Zr5qUyb6sj9MNHDhkhd7vLbayyBcRUbjb4bFA3g7rv3zyz7Oa4CYDdBrh57/
o74pLNNYWeP+h8u8F1QpI+oVHWcZQ/0/Vg2G6IExk/APPnQWWPQpHH5K4rq+tLTa
z1/fC/Y24YaoDhoq1UbBToXOK0mau95EiIpC3CQPgbjATwgF3KD/Ji6egzLwW+Mh
poADxt8XYQ+LVbRGCtm5gtPzcBGlx7tLnpAobJNZXQ3EPAgXlJ8tFhK2QLYu50qx
BQP68GhAzM5eT3vjG5uet4znAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGjBIgyX
Ri2wYqGzeX5tIgdqMhmmPvxVhAaOOT7enLlnp53gpq23fSUt7c+5lRZymnYKUlz2
XR2fiBP1ZS2H0iJvsZqnihOe7lEjVhzK5QVcenv+KCrph9x4wIZoAABONO/DnFwn
/DKSlmbe1RpLLU0VFE2Ny9lmHAKGWPrYVV6XspXJRAsFs2wR8voizpyjgMkH/7h9
XN96u3xdsAMAp5Kz9ZGpktcKVxYAHuvxOA/1qlXS419J9NCQzhHvLKBm0Pg0Hm0z
ionVDtYXgTtWIvvtirRnlAX7jmRKUOR9xLiw8d95wv/2X1TN6hMNPcl1nrgzSbrY
6O7m0xPEjKnsQis=
-----END CERTIFICATE-----
<EntityDescriptor entityID="http://cbiood.edirex.ics.muni.cz/mellon" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIICzzCCAbcCFBT9Z4ukaoX5prNGPZ526Sdxc95vMA0GCSqGSIb3DQEBCwUAMCQx
IjAgBgNVBAMMGWNiaW9vZC5lZGlyZXguaWNzLm11bmkuY3owHhcNMTkwNDE3MDkz
MjIwWhcNMjkwNDE2MDkzMjIwWjAkMSIwIAYDVQQDDBljYmlvb2QuZWRpcmV4Lmlj
cy5tdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3NQgk74l
XyXwwdH5/mF6hQPbVNmuIkAI8c4JVsZcXzpzObhL+89y2XROteLvxqVSmCXH7x9h
dwhaLzKCWQiUTNIXauimQHfRtyUGPisxcNzYf/sV3ecB/J9/ug5wtnfqAf8UWHB7
QeTBGBgSgUlTZ7S4r5CB4sReFKtJuiiK1F9OUpDe2RInbZMuEiTgqkX1o6J0ABZA
8xoW2XMxMoxI6mcI8sXlI2KJa351eWfS9cJ+m8RZEFT5DLF1kqeckah1tsdYxAD8
SB1B2yV256baJjpgQEfXYDchLTh49HD2sEom5hKwuTWiB26wGTGTsr8a75jous7M
nz/wg3GlzDd/AQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQDTCSD2ipchyE4xHvTJ
X12T15QLKrvvPnNZM2/LF2nAhR+JRjBKgHbMnuDWu6quwQ+uJiKASaM+hi+9XJqh
SQZjvmUAvTzqUncjQ170bqfip5+JmUPYj0PIwD58Xnb28nXDOmQ4XxvP2i4YEdwW
coUto0qkLusqz/ZPU8qQmPL18XB8zgewzgVbRBESy1lUtJSr53AwMjGstlqx4dMx
DBSyGA2GO6dkVSqto9kBZ7s87kxxNCrA/tQZmB5km3CZwEyx6hCKyJqQw+Huh+Ex
TO9R3dX2NRDztD8ZMQks+Uf6PfV/lqOpciHOE2FuiK8cceWzJgEueI6l6AXTxcnR
pcO5</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://cbiood.edirex.ics.muni.cz/mellon/logout"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://cbiood.edirex.ics.muni.cz/mellon/postResponse" index="0"/>
</SPSSODescriptor>
</EntityDescriptor>
-----BEGIN CERTIFICATE-----
MIICzzCCAbcCFBT9Z4ukaoX5prNGPZ526Sdxc95vMA0GCSqGSIb3DQEBCwUAMCQx
IjAgBgNVBAMMGWNiaW9vZC5lZGlyZXguaWNzLm11bmkuY3owHhcNMTkwNDE3MDkz
MjIwWhcNMjkwNDE2MDkzMjIwWjAkMSIwIAYDVQQDDBljYmlvb2QuZWRpcmV4Lmlj
cy5tdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3NQgk74l
XyXwwdH5/mF6hQPbVNmuIkAI8c4JVsZcXzpzObhL+89y2XROteLvxqVSmCXH7x9h
dwhaLzKCWQiUTNIXauimQHfRtyUGPisxcNzYf/sV3ecB/J9/ug5wtnfqAf8UWHB7
QeTBGBgSgUlTZ7S4r5CB4sReFKtJuiiK1F9OUpDe2RInbZMuEiTgqkX1o6J0ABZA
8xoW2XMxMoxI6mcI8sXlI2KJa351eWfS9cJ+m8RZEFT5DLF1kqeckah1tsdYxAD8
SB1B2yV256baJjpgQEfXYDchLTh49HD2sEom5hKwuTWiB26wGTGTsr8a75jous7M
nz/wg3GlzDd/AQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQDTCSD2ipchyE4xHvTJ
X12T15QLKrvvPnNZM2/LF2nAhR+JRjBKgHbMnuDWu6quwQ+uJiKASaM+hi+9XJqh
SQZjvmUAvTzqUncjQ170bqfip5+JmUPYj0PIwD58Xnb28nXDOmQ4XxvP2i4YEdwW
coUto0qkLusqz/ZPU8qQmPL18XB8zgewzgVbRBESy1lUtJSr53AwMjGstlqx4dMx
DBSyGA2GO6dkVSqto9kBZ7s87kxxNCrA/tQZmB5km3CZwEyx6hCKyJqQw+Huh+Ex
TO9R3dX2NRDztD8ZMQks+Uf6PfV/lqOpciHOE2FuiK8cceWzJgEueI6l6AXTxcnR
pcO5
-----END CERTIFICATE-----
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment