diff --git a/.tito/releasers.conf b/.tito/releasers.conf index 66358882..2b4c815d 100644 --- a/.tito/releasers.conf +++ b/.tito/releasers.conf @@ -13,18 +13,6 @@ remote_location = http://repos.fedorapeople.org/asb/ copr_options = --timeout 600 builder.test = 1 -[asb-brew-36] +[asb-brew] releaser = tito.release.DistGitReleaser -branches = rhaos-3.6-asb-rhel-7 - -[asb-brew-37] -releaser = tito.release.DistGitReleaser -branches = rhaos-3.7-asb-rhel-7 - -[asb-brew-38] -releaser = tito.release.DistGitReleaser -branches = rhaos-3.8-asb-rhel-7 - -[asb-brew-39] -releaser = tito.release.DistGitReleaser -branches = rhaos-3.9-asb-rhel-7 +branches = rhaos-3.11-asb-rhel-7 diff --git a/openshift/client/api_client.py b/openshift/client/api_client.py index 2ea5706c..ec710157 100644 --- a/openshift/client/api_client.py +++ b/openshift/client/api_client.py @@ -11,7 +11,7 @@ class ApiClient(K8sApiClient): def _ApiClient__deserialize(self, data, klass): if klass == 'RuntimeRawExtension': - data = {'Raw': b64encode(json.dumps(data))} + data = {'Raw': b64encode(json.dumps(data).encode()).decode()} try: return super(ApiClient, self).__deserialize(data, klass) except AttributeError: