Skip to content

Commit d341759

Browse files
nateabnateab
authoredFeb 9, 2022
build: remove release related files from ksql (confluentinc#8739)
* chore: add changes needed to make 0.23 release work * chore: promote prod images to dockerhub * chore: remove unused comment * chore: remove unused settings file * style: refactor names for clarity * remove files from ksql that should be in release repo * merge conflicts * merge conflicts * pin docker upstream tag * add maven-settings with maven s3 url
·
v8.0.0-1027.6.0.0-eep-930
1 parent f3a4a8d commit d341759

File tree

4 files changed

+62
-312
lines changed

4 files changed

+62
-312
lines changed
 

‎maven-settings.xml

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
4+
https://maven.apache.org/xsd/settings-1.0.0.xsd">
5+
<profiles>
6+
<profile>
7+
<id>release</id>
8+
9+
<activation>
10+
<activeByDefault>true</activeByDefault>
11+
</activation>
12+
13+
<repositories>
14+
<repository>
15+
<id>confluent-other</id>
16+
<name>Confluent</name>
17+
<url>https://ksqldb-maven.s3.amazonaws.com/maven/</url>
18+
</repository>
19+
20+
<!-- needed for HTML API doc generation post-release only -->
21+
<repository>
22+
<id>ksqldb-staging</id>
23+
<name>ksqlDB staging</name>
24+
<url>https://ksqldb-maven.s3.amazonaws.com/maven/</url>
25+
</repository>
26+
</repositories>
27+
28+
<pluginRepositories>
29+
30+
<pluginRepository>
31+
<id>confluent-other</id>
32+
<name>Confluent Plugin Repository</name>
33+
<url>https://ksqldb-maven.s3.amazonaws.com/maven/</url>
34+
<layout>default</layout>
35+
<snapshots>
36+
<enabled>true</enabled>
37+
</snapshots>
38+
<releases>
39+
<enabled>true</enabled>
40+
</releases>
41+
</pluginRepository>
42+
43+
</pluginRepositories>
44+
</profile>
45+
</profiles>
46+
</settings>

‎release_stabilization.py

+16-18
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
import shlex
44
from collections import OrderedDict
55

6-
DOCKER_REGISTRY = "confluent-docker-internal-stabilization.jfrog.io/"
76
DOCKER_INTERNAL_REGISTRY = "confluent-docker-internal.jfrog.io/"
8-
DOCKER_UPSTREAM_REGISTRY = "confluent-docker.jfrog.io/"
7+
DOCKER_REGISTRY = "confluent-docker.jfrog.io/"
98
CC_SPEC_KSQL_BRANCH = "master"
109
CCLOUD_DOCKER_REPO = 'confluentinc/cc-ksql'
1110
CCLOUD_DOCKER_HOTFIX_REPO = 'confluentinc/cc-ksql-hotfix'
@@ -19,19 +18,18 @@ class Callbacks:
1918
def __init__(self, working_dir, leaf, dry_run):
2019
self.leaf = leaf
2120
self.working_dir = working_dir
22-
self.settings_path = os.path.join(self.working_dir, 'stabilization_settings.xml')
2321

2422
"""This is a callback to Confluent's cloud release tooling,
2523
and allows us to have consistent versioning"""
2624
def version_as_leaf(self):
2725
return self.leaf == 'cc-docker-ksql'
2826

2927
def maven_build_args(self):
30-
build_args = ["-gs", f"{self.settings_path}", "-DskipTests", "-DskipIntegrationTests", "-DversionFilter=true", "-U", "-Dspotbugs.skip", "-Dcheckstyle.skip"]
28+
build_args = ["-DskipTests", "-DskipIntegrationTests", "-DversionFilter=true", "-U", "-Dspotbugs.skip", "-Dcheckstyle.skip"]
3129
return build_args
3230

3331
def maven_deploy_args(self):
34-
deploy_args = ["-gs", f"{self.settings_path}", "-DskipIntegrationTests", "-DversionFilter=true", "-U", "-DskipTests"]
32+
deploy_args = ["-DskipTests", "-DskipIntegrationTests", "-DversionFilter=true", "-U"]
3533
return deploy_args
3634

3735
def maven_docker_build(self):
@@ -40,8 +38,8 @@ def maven_docker_build(self):
4038
# defaults docker.tag to be version created by stabilization
4139
# mvn_docker_args["docker.tag"] =
4240

43-
mvn_docker_args["docker.registry"] = DOCKER_UPSTREAM_REGISTRY
44-
mvn_docker_args["docker.test-registry"] = DOCKER_UPSTREAM_REGISTRY
41+
mvn_docker_args["docker.registry"] = DOCKER_REGISTRY
42+
mvn_docker_args["docker.test-registry"] = DOCKER_REGISTRY
4543
mvn_docker_args["docker.upstream-registry"] = ""
4644
mvn_docker_args["docker.upstream-tag"] = "7.0.1"
4745
mvn_docker_args["skip.docker.build"] = "false"
@@ -56,31 +54,31 @@ def after_publish(self, version: str) -> bool:
5654
if "rc" not in version:
5755
# promote production images to dockerhub
5856
for docker_repo in DOCKER_REPOS:
59-
print(f"docker pull {DOCKER_UPSTREAM_REGISTRY}{docker_repo}:{version}")
60-
subprocess.run(shlex.split(f"docker pull {DOCKER_UPSTREAM_REGISTRY}{docker_repo}:{version}"))
57+
print(f"docker pull {DOCKER_REGISTRY}{docker_repo}:{version}")
58+
subprocess.run(shlex.split(f"docker pull {DOCKER_REGISTRY}{docker_repo}:{version}"))
6159

62-
print(f"docker tag {DOCKER_UPSTREAM_REGISTRY}{docker_repo}:{version} {docker_repo}:{version}")
63-
subprocess.run(shlex.split(f"docker tag {DOCKER_UPSTREAM_REGISTRY}{docker_repo}:{version} {docker_repo}:{version}"))
60+
print(f"docker tag {DOCKER_REGISTRY}{docker_repo}:{version} {docker_repo}:{version}")
61+
subprocess.run(shlex.split(f"docker tag {DOCKER_REGISTRY}{docker_repo}:{version} {docker_repo}:{version}"))
6462
print(f"docker push {docker_repo}:{version}")
6563
subprocess.run(shlex.split(f"docker push {docker_repo}:{version}"))
6664

6765
# update latest tag images on dockerhub
68-
print(f"docker tag {DOCKER_UPSTREAM_REGISTRY}{docker_repo}:{version} {docker_repo}:latest")
69-
subprocess.run(shlex.split(f"docker tag {DOCKER_UPSTREAM_REGISTRY}{docker_repo}:{version} {docker_repo}:latest"))
66+
print(f"docker tag {DOCKER_REGISTRY}{docker_repo}:{version} {docker_repo}:latest")
67+
subprocess.run(shlex.split(f"docker tag {DOCKER_REGISTRY}{docker_repo}:{version} {docker_repo}:latest"))
7068
print(f"docker push {docker_repo}:latest")
7169
subprocess.run(shlex.split(f"docker push {docker_repo}:latest"))
7270

7371
# pull, tag, and push latest docker on-prem images
7472
for docker_repo in DOCKER_REPOS:
75-
print(f"docker tag {DOCKER_UPSTREAM_REGISTRY}{DOCKER_ARTIFACT}:{version} {DOCKER_INTERNAL_REGISTRY}{docker_repo}:{version}")
76-
subprocess.run(shlex.split(f"docker tag {DOCKER_UPSTREAM_REGISTRY}{DOCKER_ARTIFACT}:{version} {DOCKER_INTERNAL_REGISTRY}{docker_repo}:{version}"))
73+
print(f"docker tag {DOCKER_REGISTRY}{DOCKER_ARTIFACT}:{version} {DOCKER_INTERNAL_REGISTRY}{docker_repo}:{version}")
74+
subprocess.run(shlex.split(f"docker tag {DOCKER_REGISTRY}{DOCKER_ARTIFACT}:{version} {DOCKER_INTERNAL_REGISTRY}{docker_repo}:{version}"))
7775
print(f"docker push {DOCKER_INTERNAL_REGISTRY}{docker_repo}:{version}")
7876
subprocess.run(shlex.split(f"docker push {DOCKER_INTERNAL_REGISTRY}{docker_repo}:{version}"))
7977

78+
# clone kafka tutorials and checkout 'ksqldb-latest'
8079
git_cmd_kafka_tutorial = f"git --git-dir={self.working_dir}/kafka-tutorials/.git --work-tree={self.working_dir}/kafka-tutorials"
8180
print(f"{git_cmd_kafka_tutorial}")
8281

83-
# clone kafka tutorials and checkout 'ksqldb-latest'
8482
kafka_tutorials_cwd = os.path.join(self.working_dir, 'kafka-tutorials')
8583
print(f"{kafka_tutorials_cwd}")
8684

@@ -94,8 +92,8 @@ def after_publish(self, version: str) -> bool:
9492
print(f"{kafka_tutorials_cwd}")
9593
print(f"{self.working_dir}")
9694
update_ksqldb_version_path = os.path.join(self.working_dir, 'kafka-tutorials/tools/update-ksqldb-version.sh')
97-
print(f"{update_ksqldb_version_path} {version} {DOCKER_UPSTREAM_REGISTRY}")
98-
subprocess.run(shlex.split(f"{update_ksqldb_version_path} {version} {DOCKER_UPSTREAM_REGISTRY}"))
95+
print(f"{update_ksqldb_version_path} {version} {DOCKER_REGISTRY}")
96+
subprocess.run(shlex.split(f"{update_ksqldb_version_path} {version} {DOCKER_REGISTRY}"))
9997

10098
print(f"{git_cmd_kafka_tutorial} diff")
10199
subprocess.run(shlex.split(f"{git_cmd_kafka_tutorial} diff"), cwd=kafka_tutorials_cwd)

‎scripts/release/build-packages.sh

-143
This file was deleted.

‎stabilization_settings.xml

-151
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.