Skip to content

Commit

Permalink
Merge pull request #324 from antonym/r14.23.0-bump
Browse files Browse the repository at this point in the history
Bump Newton Leapfrogs to use r14.23.0
  • Loading branch information
antonym authored Jan 30, 2019
2 parents 9ac8582 + 9dbcd4e commit 4aa1c99
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ rpc-upgrades repo supports:

Leapfrog upgrades from:

* kilo to r14.21.0 (newton)
* liberty to r14.21.0 (newton)
* mitaka to r14.21.0 (newton)
* kilo to r14.23.0 (newton)
* liberty to r14.23.0 (newton)
* mitaka to r14.23.0 (newton)

Full docs for Leapfrog upgrades are `here <leapfrog.rst>`_.

Expand Down
10 changes: 5 additions & 5 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ end
# Configure Job Actions the way gating would pass them
job_actions = [
"kilo_to_newton_leap",
"kilo_to_r14.21.0_leap",
"kilo_to_r14.23.0_leap",
"liberty_to_newton_leap",
"mitaka_to_newton_leap",
"r12.1.2_to_r14.21.0_leap",
"r12.2.2_to_r14.21.0_leap",
"r12.2.5_to_r14.21.0_leap",
"r12.2.8_to_r14.21.0_leap",
"r12.1.2_to_r14.23.0_leap",
"r12.2.2_to_r14.23.0_leap",
"r12.2.5_to_r14.23.0_leap",
"r12.2.8_to_r14.23.0_leap",
"newton_to_queens_inc",
"pike_to_queens_inc",
"queens_to_rocky_inc"
Expand Down
12 changes: 6 additions & 6 deletions leapfrog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ rpc-upgrades repo supports:

Leapfrog upgrades from:

* kilo to r14.21.0 (newton)
* liberty to r14.21.0 (newton)
* mitaka to r14.21.0 (newton)
* kilo to r14.23.0 (newton)
* liberty to r14.23.0 (newton)
* mitaka to r14.23.0 (newton)

Job Testing
-----------
Expand All @@ -41,7 +41,7 @@ Terms
* `OSA-OPS <https://github.com/openstack/openstack-ansible-ops>`_: OpenStack Operations
* `Kilo <https://github.com/rcbops/rpc-openstack/tree/kilo>`_: The RPCO release of OpenStack Kilo
* `Liberty <https://github.com/rcbops/rpc-openstack/tree/liberty>`_: The RPCO release of OpenStack Liberty
* `r14.21.0 <https://github.com/rcbops/rpc-openstack/tree/r14.21.0>`_: The RPCO release of OpenStack Newton.
* `r14.23.0 <https://github.com/rcbops/rpc-openstack/tree/r14.23.0>`_: The RPCO release of OpenStack Newton.

Pre Upgrade Tasks
------------------
Expand Down Expand Up @@ -92,11 +92,11 @@ containers on CONTAINERS_TO_DESTROY as this will override the default that inclu
export CONTAINERS_TO_DESTROY='all_containers:!galera_all:!neutron_agent:!ceph_all:!rsyslog_all:!elasticsearch_all:!swift_all'
**Note:** *Currently the rpc-upgrades repo targets r14.21.0. If you want to deploy the previous version you can:*
**Note:** *Currently the rpc-upgrades repo targets r14.23.0. If you want to deploy the previous version you can:*

.. code-block:: shell
export RPC_TARGET_CHECKOUT=r14.20.0
export RPC_TARGET_CHECKOUT=r14.22.0
If you cannot locate `/etc/openstack-release` or it is outdated. Export the release version which upgrade from manually:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
features:
- |
Leaps to Newton r14.21.0
Leaps to Newton r14.23.0
issues:
- |
Additional bug fixes/optimizations to Incremental upgrades
2 changes: 1 addition & 1 deletion scripts/ubuntu14-leapfrog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export POST_LEAP_STEPS="${LEAP_BASE_DIR}/post_leap.sh"
export RPCD_DEFAULTS='/etc/openstack_deploy/user_rpco_variables_defaults.yml'
export OA_DEFAULTS='/etc/openstack_deploy/user_osa_variables_defaults.yml'
# Set the target checkout used when leaping forward.
export RPC_TARGET_CHECKOUT=${RPC_TARGET_CHECKOUT:-'r14.21.0'}
export RPC_TARGET_CHECKOUT=${RPC_TARGET_CHECKOUT:-'r14.23.0'}
export RPC_APT_ARTIFACT_MODE=loose
export QC_TEST=${QC_TEST:-'no'}
export RUN_PREFLIGHT=${RUN_PREFLIGHT:-yes}
Expand Down
2 changes: 1 addition & 1 deletion testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ you wish to test with.

.. code-block:: shell
export RE_JOB_ACTION=r12.2.8_to_r14.21.0_leap
export RE_JOB_ACTION=r12.2.8_to_r14.23.0_leap
./run-tests.sh
Expand Down
2 changes: 1 addition & 1 deletion tests/create-mnaio-snap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function determine_manifest {
if [ "${RE_JOB_SERIES}" == "pike" ]; then
export RPCO_IMAGE_MANIFEST_URL="${RPCO_ARTIFACT_URL}/r16.2.8-xenial_mnaio_no_artifacts-swift/manifest.json"
elif [ "${RE_JOB_SERIES}" == "newton" ]; then
export RPCO_IMAGE_MANIFEST_URL="${RPCO_ARTIFACT_URL}/r14.21.0-xenial_mnaio_loose_artifacts-swift/manifest.json"
export RPCO_IMAGE_MANIFEST_URL="${RPCO_ARTIFACT_URL}/r14.23.0-xenial_mnaio_loose_artifacts-swift/manifest.json"
else
exit 1
fi
Expand Down

0 comments on commit 4aa1c99

Please sign in to comment.