Refactor imagebumper + bump Tempest
Tempest is branchless, so we can bump to
the latest version of Tempest.
Skip-Release-Notes
Change-Id: I08aa5ce1b293d1e1e23735281dedc5c14473b88a
diff --git a/Cargo.lock b/Cargo.lock
index 91bb852..9232d84 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -118,9 +118,13 @@
name = "atmosphere"
version = "0.0.0"
dependencies = [
+ "clap",
+ "env_logger",
"git2",
"git2-hooks",
+ "imagebumper",
"indoc",
+ "log",
"md5",
"regex",
"reqwest",
@@ -1029,14 +1033,8 @@
version = "0.1.0"
dependencies = [
"async-trait",
- "clap",
- "env_logger",
"gitea-sdk",
- "log",
"octocrab",
- "regex",
- "reqwest",
- "serde_json",
"tokio",
"url",
]
diff --git a/Cargo.toml b/Cargo.toml
index 2e10d47..6496d93 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,9 +3,13 @@
edition = "2021"
[dependencies]
+clap = { version = "4.5.29", features = ["derive"] }
+env_logger = { version = "0.11.6", features = ["unstable-kv"] }
git2 = "0.20.0"
git2-hooks = "0.4.0"
+imagebumper = { path = "crates/imagebumper" }
indoc = "2.0.5"
+log = { version = "0.4.25", features = ["kv"] }
md5 = "0.7.0"
regex = "1.11.1"
reqwest = { version = "0.12.12", features = ["json", "native-tls-vendored"] }
diff --git a/crates/imagebumper/Cargo.toml b/crates/imagebumper/Cargo.toml
index b8af954..ac47dd8 100644
--- a/crates/imagebumper/Cargo.toml
+++ b/crates/imagebumper/Cargo.toml
@@ -5,13 +5,7 @@
[dependencies]
async-trait = "0.1.86"
-clap = { version = "4.5.29", features = ["derive"] }
-env_logger = { version = "0.11.6", features = ["unstable-kv"] }
gitea-sdk = "0.5.0"
-log = { version = "0.4.25", features = ["kv"] }
octocrab = "0.43.0"
-regex = "1.11.1"
-reqwest = { version = "0.12.12", features = ["json", "native-tls-vendored"] }
-serde_json = "1.0.138"
tokio = { version = "1.43.0", features = ["fs", "macros", "rt-multi-thread"] }
url = "2.5.4"
diff --git a/images/tempest/Dockerfile b/images/tempest/Dockerfile
index dc558d9..bb3aecb 100644
--- a/images/tempest/Dockerfile
+++ b/images/tempest/Dockerfile
@@ -10,7 +10,7 @@
/src/octavia_tempest_plugin/contrib/test_server/test_server.go
FROM openstack-venv-builder AS build
-ARG TEMPEST_GIT_REF=338a3b7224a55e88fc46d7f80e8896a3231b910e
+ARG TEMPEST_GIT_REF=50bd5aa470db2958018513ab43696dbb2596b30f
ADD --keep-git-dir=true https://opendev.org/openstack/tempest.git#${TEMPEST_GIT_REF} /src/tempest
RUN git -C /src/tempest fetch --unshallow
ADD --keep-git-dir=true https://opendev.org/openstack/barbican-tempest-plugin.git#master /src/barbican-tempest-plugin
diff --git a/crates/imagebumper/src/main.rs b/src/bin/imagebumper.rs
similarity index 100%
rename from crates/imagebumper/src/main.rs
rename to src/bin/imagebumper.rs