Skip to content

correct permissions in spec file and fix class path specified variable - #3030

Merged
yadvr merged 6 commits into
apache:4.11from
svenvogel:improve-spec-file
Nov 30, 2018
Merged

correct permissions in spec file and fix class path specified variable#3030
yadvr merged 6 commits into
apache:4.11from
svenvogel:improve-spec-file

Conversation

@svenvogel

Copy link
Copy Markdown
Contributor

Description

There are only two small, small, small really small fixes.

Install CentOS 7 e.g. Build 1804 and Java build 1.8.0_181

if you inspect systemd in debug mode you will see some errors
1.
image
permission of the cloudstack-managment.service are not corretly set
2.
image
invalid classpath specified. it seems the string which is used will be divided... we now we use ${..} like the lines above ... 😕

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Screenshots (if appropriate):

How Has This Been Tested?

We tested it on our test environment! We create own build with our test pipeline.

CentOS 7 Build 1804, Cloudstack 4.11, Java Build 1.8.0_181, systemd Build 219-57.el7_5.3

@yadvr

yadvr commented Nov 15, 2018

Copy link
Copy Markdown
Member

LGTM, @svenvogel if possible could you rebase and edit the branch to 4.11. It will be useful to get this for 4.11 as well. Also, do you think we should also fix for el6/centos6 spec?
Thanks.

@yadvr

yadvr commented Nov 15, 2018

Copy link
Copy Markdown
Member

Nevermind my comment for centos6, it does not have systemd so I guess does not apply.

@svenvogel
svenvogel changed the base branch from master to 4.11 November 15, 2018 09:11
@svenvogel

Copy link
Copy Markdown
Contributor Author

@rhtyd changed! :)

@yadvr

yadvr commented Nov 15, 2018

Copy link
Copy Markdown
Member

Can you rebase against 4.11 as well, I see several extra commits @svenvogel

@yadvr
yadvr changed the base branch from 4.11 to master November 16, 2018 11:23
@yadvr

yadvr commented Nov 16, 2018

Copy link
Copy Markdown
Member

@svenvogel please rebase against 4.11, or if it's difficult you can try this:

  • note down the shas of the two commits
  • git checkout your-branch
  • git reset --hard origin/4.11
  • git cherry-pick
  • git cherry-pick
  • git push <remote|origin> your-branch -fv (and then edit the PR branch to 4.11!)

@svenvogel
svenvogel changed the base branch from master to 4.11 November 16, 2018 14:52
@svenvogel
svenvogel changed the base branch from 4.11 to master November 16, 2018 14:53
@svenvogel
svenvogel changed the base branch from master to 4.11 November 16, 2018 14:53
@svenvogel
svenvogel changed the base branch from 4.11 to master November 16, 2018 14:53
@svenvogel
svenvogel changed the base branch from master to 4.11 November 17, 2018 15:24
@svenvogel

Copy link
Copy Markdown
Contributor Author

Hi @rhtyd i tried my best to get it working... cool step by step guide... is it now okay?

<<<<<<< HEAD
ExecStart=/usr/bin/jsvc -home "${JAVA_HOME}" -user "${CLOUDSTACK_USER}" -cp "${JARS}:${CLASSPATH}" -errfile ${LOGDIR}/${NAME}.err -cwd ${LOGDIR} -pidfile "${CLOUDSTACK_PID}" ${JAVA_OPTS} "${BOOTSTRAP_CLASS}"
ExecStop=/usr/bin/jsvc -cp "$JARS:$CLASSPATH" -pidfile "$CLOUDSTACK_PID" -stop "$BOOTSTRAP_CLASS"
=======

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a git artifact, @svenvogel . It should not show here, so something went wrong :(

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DaanHoogland can you check again ;)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good now.

@DaanHoogland

Copy link
Copy Markdown
Contributor

@rhtyd not sure if we need full testing but I'll package to get at least that part covered.
@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@DaanHoogland a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2447

@DaanHoogland

Copy link
Copy Markdown
Contributor

better not sorry
@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@svenvogel

Copy link
Copy Markdown
Contributor Author

@DaanHoogland ca we merge it? what do you think?

@DaanHoogland

Copy link
Copy Markdown
Contributor

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@DaanHoogland

Copy link
Copy Markdown
Contributor

@blueorangutan test

@svenvogel

Copy link
Copy Markdown
Contributor Author

@rhtyd can you test again?

@yadvr

yadvr commented Nov 24, 2018

Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2455

@yadvr

yadvr commented Nov 24, 2018

Copy link
Copy Markdown
Member

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@svenvogel

Copy link
Copy Markdown
Contributor Author

@rhtyd looks good? can we merge it?

@yadvr

yadvr commented Nov 27, 2018

Copy link
Copy Markdown
Member

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@borisstoyanov borisstoyanov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the last failure management failed to start @rhtyd @svenvogel, don't know if it's related to these changes

@yadvr

yadvr commented Nov 27, 2018

Copy link
Copy Markdown
Member

A bug in trillian was fixed. Let's retry.
@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@svenvogel

Copy link
Copy Markdown
Contributor Author

@rhtyd @DaanHoogland is it ready?

@yadvr

yadvr commented Nov 29, 2018

Copy link
Copy Markdown
Member

Looks like some errors in pkging or env deployment
@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✖debian. JID-2473

@yadvr

yadvr commented Nov 29, 2018

Copy link
Copy Markdown
Member

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@yadvr

yadvr commented Nov 30, 2018

Copy link
Copy Markdown
Member

@svenvogel the mgmt server failed to start due to the JAVA_DEBUG option. I tried to define an empty variable in /etc/default/cloudstack-management but it still failed to run. On removing it, it worked. Was it intended to add such a variable? Please fix accordingly, I've removed it to make tests work.
@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2474

@yadvr

yadvr commented Nov 30, 2018

Copy link
Copy Markdown
Member

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-3239)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 20395 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3030-t3239-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 66 look OK, 2 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_02_cancel_host_maintenace_with_migration_jobs Error 1.36 test_host_maintenance.py
test_hostha_kvm_host_degraded Error 7.85 test_hostha_kvm.py

@yadvr yadvr added this to the 4.11.3.0 milestone Nov 30, 2018
@yadvr
yadvr merged commit 1709792 into apache:4.11 Nov 30, 2018
@svenvogel

Copy link
Copy Markdown
Contributor Author

Thanks @rhtyd you are right. That was a artifact from my testing.

@borisstoyanov borisstoyanov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants